tweak messages

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

Author: smeyer

src/library/tools/R/RdConv2.R

@@ -537,7 +537,8 @@ prepare2_Rd <- function(Rd, Rdfile, stages)
     if (length(enc)) {
     	encoding <- Rd[[enc[1L]]]
     	if (!identical(RdTags(encoding), "TEXT"))
-    	    stopRd(encoding, Rdfile, "'encoding' must be plain text")
+            stopRd(encoding, Rdfile,
+                   "\\encoding must be plain text on a line by itself")
     }
 
     dt <- which(sections == "\\docType")
@@ -1124,8 +1125,8 @@ checkRd <- function(Rd, defines = .Platform$OS.type, stages = "render",
     if (any(sections == "\\encoding")) def_enc <- TRUE
     inEnc2 <- FALSE
     for (i in seq_along(sections)) {
-        sectiontag <- sections[i]
-        checkSection(Rd[[i]], sections[i])
+        sectiontag <- sections[i] # also used in checkLIST()
+        checkSection(Rd[[i]], sectiontag)
     }
 
     structure(.messages, class = "checkRd")

src/library/tools/R/parseRd.R

@@ -51,7 +51,7 @@ parse_Rd <- function(file, srcfile = NULL, encoding = "unknown",
         ## keep first one
         enc <- enc[1L]
         enc <- sub("^[[:space:]]*\\\\encoding\\{([^}]*)\\}.*", "\\1", enc)
-        if(verbose) message("found encoding ", enc, domain = NA)
+        if(verbose) message("found encoding ", sQuote(enc), domain = NA)
         encoding <- if(enc %in% c("UTF-8", "utf-8", "utf8")) "UTF-8" else enc
     }
     if (length(encoding) != 1L || encoding == "unknown") encoding <- ""