# HG changeset patch
# User wenzelm
# Date 1374954192 -7200
# Node ID a7d69a11f395d95b8c3f8c5f39267001bb18e40d
# Parent  e7296939fec2e12b4b6c77b51595d89057ea5fc4
discontinued ISABELLE_DOC_FORMAT;

diff -r e7296939fec2 -r a7d69a11f395 NEWS
--- a/NEWS	Sat Jul 27 21:21:47 2013 +0200
+++ b/NEWS	Sat Jul 27 21:43:12 2013 +0200
@@ -323,6 +323,9 @@
 * Discontinued obsolete isabelle print tool, and PRINT_COMMAND
 settings variable.
 
+* Discontinued ISABELLE_DOC_FORMAT settings variable -- the preferred
+document format is always pdf.
+
 * Isabelle settings variable ISABELLE_BUILD_JAVA_OPTIONS allows to
 specify global resources of the JVM process run by isabelle build.
 
diff -r e7296939fec2 -r a7d69a11f395 etc/settings
--- a/etc/settings	Sat Jul 27 21:21:47 2013 +0200
+++ b/etc/settings	Sat Jul 27 21:43:12 2013 +0200
@@ -92,9 +92,6 @@
 # Where to look for docs (multiple dirs separated by ':').
 ISABELLE_DOCS="$ISABELLE_HOME/doc"
 
-# Preferred document format
-ISABELLE_DOC_FORMAT=pdf
-
 # PDF file viewer (command-line to eval)
 case "$ISABELLE_PLATFORM_FAMILY" in
   linux)
diff -r e7296939fec2 -r a7d69a11f395 lib/Tools/mkroot
--- a/lib/Tools/mkroot	Sat Jul 27 21:21:47 2013 +0200
+++ b/lib/Tools/mkroot	Sat Jul 27 21:43:12 2013 +0200
@@ -89,7 +89,7 @@
 if [ "$DOC" = true ]; then
   cat > "$DIR/ROOT" <<EOF
 session "$NAME" = "$ISABELLE_LOGIC" +
-  options [document = $ISABELLE_DOC_FORMAT, document_output = "output"]
+  options [document = pdf, document_output = "output"]
   theories [document = false]
     (* Foo Bar *)
   theories
diff -r e7296939fec2 -r a7d69a11f395 src/Doc/System/Basics.thy
--- a/src/Doc/System/Basics.thy	Sat Jul 27 21:21:47 2013 +0200
+++ b/src/Doc/System/Basics.thy	Sat Jul 27 21:43:12 2013 +0200
@@ -268,9 +268,6 @@
   \item[@{setting_def ISABELLE_DOCS}] is a colon separated list of
   directories with documentation files.
   
-  \item[@{setting_def ISABELLE_DOC_FORMAT}] specifies the preferred
-  document format, typically @{verbatim pdf} or @{verbatim dvi}.
-
   \item[@{setting_def PDF_VIEWER}] specifies the command-line to be
   used for displaying @{verbatim pdf} files.
 
diff -r e7296939fec2 -r a7d69a11f395 src/Pure/Thy/present.ML
--- a/src/Pure/Thy/present.ML	Sat Jul 27 21:21:47 2013 +0200
+++ b/src/Pure/Thy/present.ML	Sat Jul 27 21:43:12 2013 +0200
@@ -447,8 +447,6 @@
 
 fun display_drafts src_paths = Isabelle_System.with_tmp_dir "drafts" (fn dir =>
   let
-    val doc_format = getenv "ISABELLE_DOC_FORMAT";
-
     fun prep_draft path i =
       let
         val base = Path.base path;
@@ -483,8 +481,8 @@
     val _ = write_tex_index tex_index doc_path;
 
     val result =
-      isabelle_document {verbose = false, purge = true} doc_format documentN "" doc_path;
-    val detachable_result = Isabelle_System.create_tmp_path documentN doc_format;
+      isabelle_document {verbose = false, purge = true} "pdf" documentN "" doc_path;
+    val detachable_result = Isabelle_System.create_tmp_path documentN "pdf";
     val _ = File.copy result detachable_result;
   in
     Isabelle_System.isabelle_tool "display" ("-c " ^ File.shell_path detachable_result ^ " &")