1.1 --- a/Admin/lib/Tools/build_doc	Sat Jul 27 20:28:28 2013 +0200
     1.2 +++ b/Admin/lib/Tools/build_doc	Sat Jul 27 21:01:35 2013 +0200
     1.3 @@ -17,7 +17,6 @@
     1.4    echo "  Options are:"
     1.5    echo "    -a           select all doc sessions"
     1.6    echo "    -j INT       maximum number of parallel jobs (default 1)"
     1.7 -  echo "    -p           build only pdf documents"
     1.8    echo
     1.9    echo "  Build Isabelle documentation from (doc) sessions."
    1.10    echo
    1.11 @@ -42,9 +41,8 @@
    1.12  
    1.13  ALL_DOCS="false"
    1.14  JOBS=""
    1.15 -PDF_ONLY=""
    1.16  
    1.17 -while getopts "aj:p" OPT
    1.18 +while getopts "aj:" OPT
    1.19  do
    1.20    case "$OPT" in
    1.21      a)
    1.22 @@ -54,9 +52,6 @@
    1.23        check_number "$OPTARG"
    1.24        JOBS="-j $OPTARG"
    1.25        ;;
    1.26 -    p)
    1.27 -      PDF_ONLY="true"
    1.28 -      ;;
    1.29      \?)
    1.30        usage
    1.31        ;;
    1.32 @@ -91,32 +86,14 @@
    1.33  "$ISABELLE_TOOL" build -R -b $JOBS "${BUILD_ARGS[@]}"
    1.34  RC=$?
    1.35  
    1.36 -if [ "$PDF_ONLY" = true ]; then
    1.37 -  FORMATS="pdf"
    1.38 -else
    1.39 -  FORMATS="dvi pdf"
    1.40 +if [ "$RC" = 0 ]; then
    1.41 +  "$ISABELLE_TOOL" build -o browser_info=false -o "document=pdf" \
    1.42 +    -o "document_output=$OUTPUT" -c $JOBS "${BUILD_ARGS[@]}"
    1.43 +  RC=$?
    1.44  fi
    1.45  
    1.46 -for FORMAT in $FORMATS
    1.47 -do
    1.48 -  if [ "$RC" = 0 ]; then
    1.49 -    echo "Document format: $FORMAT"
    1.50 -    "$ISABELLE_TOOL" build -o browser_info=false -o "document=$FORMAT" \
    1.51 -      -o "document_output=$OUTPUT" -c $JOBS "${BUILD_ARGS[@]}"
    1.52 -    RC=$?
    1.53 -  fi
    1.54 -done
    1.55 -
    1.56  if [ "$RC" = 0 ]; then
    1.57 -  for FILE in $(find "$OUTPUT" -name "*.eps" -o -name "*.ps")
    1.58 -  do
    1.59 -    cp -f "$FILE" "$ISABELLE_HOME/doc"
    1.60 -  done
    1.61 -  if [ "$PDF_ONLY" = true ]; then
    1.62 -    cp -f "$OUTPUT"/*.pdf "$ISABELLE_HOME/doc"
    1.63 -  else
    1.64 -    cp -f "$OUTPUT"/*.dvi "$OUTPUT"/*.pdf "$ISABELLE_HOME/doc"
    1.65 -  fi
    1.66 +  cp -f "$OUTPUT"/*.pdf "$ISABELLE_HOME/doc"
    1.67  fi
    1.68  
    1.69  rm -rf "$OUTPUT"

     2.1 --- a/src/Pure/Tools/doc.scala	Sat Jul 27 20:28:28 2013 +0200
     2.2 +++ b/src/Pure/Tools/doc.scala	Sat Jul 27 21:01:35 2013 +0200
     2.3 @@ -18,7 +18,7 @@
     2.4      Path.split(Isabelle_System.getenv("ISABELLE_DOCS")).map(dir =>
     2.5        if (dir.is_dir) dir
     2.6        else error("Bad documentation directory: " + dir))
     2.7 -    
     2.8 +
     2.9  
    2.10    /* contents */
    2.11  
    2.12 @@ -69,7 +69,7 @@
    2.13  
    2.14    def view(name: String)
    2.15    {
    2.16 -    val doc = name + "." + Isabelle_System.getenv_strict("ISABELLE_DOC_FORMAT")
    2.17 +    val doc = name + ".pdf"
    2.18      dirs().find(dir => (dir + Path.basic(doc)).is_file) match {
    2.19        case Some(dir) =>
    2.20          Isabelle_System.bash_env(dir.file, null,