discontinued ISABELLE_DOC_FORMAT;
authorwenzelm
Sat Jul 27 21:43:12 2013 +0200 (2013-07-27)
changeset 52743a7d69a11f395
parent 52742 e7296939fec2
child 52744 49825ba687ce
discontinued ISABELLE_DOC_FORMAT;
NEWS
etc/settings
lib/Tools/mkroot
src/Doc/System/Basics.thy
src/Pure/Thy/present.ML
     1.1 --- a/NEWS	Sat Jul 27 21:21:47 2013 +0200
     1.2 +++ b/NEWS	Sat Jul 27 21:43:12 2013 +0200
     1.3 @@ -323,6 +323,9 @@
     1.4  * Discontinued obsolete isabelle print tool, and PRINT_COMMAND
     1.5  settings variable.
     1.6  
     1.7 +* Discontinued ISABELLE_DOC_FORMAT settings variable -- the preferred
     1.8 +document format is always pdf.
     1.9 +
    1.10  * Isabelle settings variable ISABELLE_BUILD_JAVA_OPTIONS allows to
    1.11  specify global resources of the JVM process run by isabelle build.
    1.12  
     2.1 --- a/etc/settings	Sat Jul 27 21:21:47 2013 +0200
     2.2 +++ b/etc/settings	Sat Jul 27 21:43:12 2013 +0200
     2.3 @@ -92,9 +92,6 @@
     2.4  # Where to look for docs (multiple dirs separated by ':').
     2.5  ISABELLE_DOCS="$ISABELLE_HOME/doc"
     2.6  
     2.7 -# Preferred document format
     2.8 -ISABELLE_DOC_FORMAT=pdf
     2.9 -
    2.10  # PDF file viewer (command-line to eval)
    2.11  case "$ISABELLE_PLATFORM_FAMILY" in
    2.12    linux)
     3.1 --- a/lib/Tools/mkroot	Sat Jul 27 21:21:47 2013 +0200
     3.2 +++ b/lib/Tools/mkroot	Sat Jul 27 21:43:12 2013 +0200
     3.3 @@ -89,7 +89,7 @@
     3.4  if [ "$DOC" = true ]; then
     3.5    cat > "$DIR/ROOT" <<EOF
     3.6  session "$NAME" = "$ISABELLE_LOGIC" +
     3.7 -  options [document = $ISABELLE_DOC_FORMAT, document_output = "output"]
     3.8 +  options [document = pdf, document_output = "output"]
     3.9    theories [document = false]
    3.10      (* Foo Bar *)
    3.11    theories
     4.1 --- a/src/Doc/System/Basics.thy	Sat Jul 27 21:21:47 2013 +0200
     4.2 +++ b/src/Doc/System/Basics.thy	Sat Jul 27 21:43:12 2013 +0200
     4.3 @@ -268,9 +268,6 @@
     4.4    \item[@{setting_def ISABELLE_DOCS}] is a colon separated list of
     4.5    directories with documentation files.
     4.6    
     4.7 -  \item[@{setting_def ISABELLE_DOC_FORMAT}] specifies the preferred
     4.8 -  document format, typically @{verbatim pdf} or @{verbatim dvi}.
     4.9 -
    4.10    \item[@{setting_def PDF_VIEWER}] specifies the command-line to be
    4.11    used for displaying @{verbatim pdf} files.
    4.12  
     5.1 --- a/src/Pure/Thy/present.ML	Sat Jul 27 21:21:47 2013 +0200
     5.2 +++ b/src/Pure/Thy/present.ML	Sat Jul 27 21:43:12 2013 +0200
     5.3 @@ -447,8 +447,6 @@
     5.4  
     5.5  fun display_drafts src_paths = Isabelle_System.with_tmp_dir "drafts" (fn dir =>
     5.6    let
     5.7 -    val doc_format = getenv "ISABELLE_DOC_FORMAT";
     5.8 -
     5.9      fun prep_draft path i =
    5.10        let
    5.11          val base = Path.base path;
    5.12 @@ -483,8 +481,8 @@
    5.13      val _ = write_tex_index tex_index doc_path;
    5.14  
    5.15      val result =
    5.16 -      isabelle_document {verbose = false, purge = true} doc_format documentN "" doc_path;
    5.17 -    val detachable_result = Isabelle_System.create_tmp_path documentN doc_format;
    5.18 +      isabelle_document {verbose = false, purge = true} "pdf" documentN "" doc_path;
    5.19 +    val detachable_result = Isabelle_System.create_tmp_path documentN "pdf";
    5.20      val _ = File.copy result detachable_result;
    5.21    in
    5.22      Isabelle_System.isabelle_tool "display" ("-c " ^ File.shell_path detachable_result ^ " &")