Turn on TOC by default in HTML help by setting options(help.htmltoc = TRUE)

git-svn-id: https://svn.r-project.org/R/trunk@88944 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: deepayan

config.site

@@ -1,5 +1,7 @@
 #! /bin/sh
 
+LOCAL=/opt/R/x86_64
+
 ### This file is part of R.
 ###
 ### R is free software; you can redistribute it and/or modify it under
@@ -45,7 +47,7 @@
 ## It is also necessary to set the architecture here, e.g. 'gcc -m32'.
 ## If this is a wrapper it should pass on --version to the real compiler.
 ## This will be replaced by CC23 (see below) if a C23 compiler is found.
-## CC=
+CC=clang
 
 ## Debugging and optimization options for the C compiler.
 ## Use this to specify CFLAGS for the version of the C compiler
@@ -111,12 +113,12 @@
 ## options (such as defines) for the C preprocessor and compiler.
 ## If unset defaults to '-I/usr/local/include', with '-I/sw/include'
 ## prepended on systems using Fink with root '/sw'.
-## CPPFLAGS=
+CPPFLAGS='-isystem $LOCAL/include'
 
 ## The command which runs the Fortran compiler.
 ## Used for both fixed-form and free-form Fortran
 ## If this is a wrapper it should pass on --version to the real compiler.
-## FC=
+FC="/opt/gfortran/bin/gfortran -mtune=native"
 
 ## Options for the Fortran compiler.
 ## Use this to specify comilation flags for fixed-form Fortran.
@@ -223,7 +225,7 @@
 ## and then looks under the names 'c++', 'g++', 'CC' and more OS-specific
 ## names (from autoconf).
 ## If this is a wrapper it should pass on --version to the real compiler.
-## CXX=
+CXX=clang++
 
 ## Options for the C++ compiler.
 ## CXXFLAGS=
@@ -255,7 +257,7 @@
 
 ## Objective-C(++), mainly for macOS
 ## On macOS, Apple clang with additional gcc flag -fobjc-exceptions
-## OBJC=
+OBJC=$CC
 ## OBJCFLAGS=
 ## OBJC_LIBS-
 ## Objective-C compiler, usually the same as $CXX $CXXSTD

src/library/tools/R/Rd2HTML.R

@@ -370,7 +370,9 @@ createRedirects <- function(file, Rdobj)
 
 
 staticLogoPath <- function(package, relative = FALSE, Rhome = "../../..", dir = FALSE) {
-    if (dir) {
+    ## This may be called with package="" (e.g., for standalone Rd files)
+    if (!nzchar(package)) file <- R.home("doc/html/Rlogo.svg")
+    else if (dir) {
         file <- file.path(package, "man", "figures", "logo.png")
         if (!file.exists(file)) file <- file.path(package, "man", "figures", "logo.svg")
         if (!file.exists(file)) file <- R.home("doc/html/Rlogo.svg")
@@ -388,7 +390,6 @@ staticLogoPath <- function(package, relative = FALSE, Rhome = "../../..", dir =
 }
 
 
-
 ## This gets used two ways:
 
 ## 1) With dynamic = TRUE from tools:::httpd()

src/library/tools/R/zzz.R

@@ -57,4 +57,7 @@ rm(C_parseLatex)
     } else if (!is.na(iconv("\u2022", "UTF-8", "")))
 	Rd2txt_options(itemBullet = "\u2022 ")
     Rd_expr_bibshow_bibstyle(Sys.getenv("R_HELP_BIBSTYLE", "R"))
+    op.tools <- list(help.htmltoc = TRUE)
+    toset <- !(names(op.tools) %in% names(.Options))
+    if(any(toset)) options(op.tools[toset])
 }