Port r54863 from trunk

git-svn-id: https://svn.r-project.org/R/branches/R-2-12-branch@54865 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/NEWS.Rd

@@ -41,6 +41,9 @@
       \item Non-ascii characters in the titles of help pages were 
       not rendered properly in some locales, and could cause errors
       or warnings.
+
+      \item \code{checkRd()} gave a spurious error if the \code{\\href} 
+      macro was used.
     }
   }
 }

src/library/tools/R/RdConv2.R

@@ -696,6 +696,11 @@ checkRd <- function(Rd, defines=.Platform$OS.type, stages="render",
                    if (tag == "\\ifelse")
                        checkContent(block[[3L]])
                },
+               "\\href" = {
+                   if (!identical(RdTags(block[[1L]]), "VERB"))
+                   	stopRd(block, Rdfile, "First argument to \\href must be verbatim URL")
+               	   checkContent(block[[2L]], tag)
+               },
                "\\out" = {
                	   tags <- RdTags(block)
                	   if (!all(tags == "VERB"))

src/main/gramRd.c

@@ -3812,6 +3812,10 @@ struct {
     char *name;
     int token;
 }
+
+/* When adding keywords here, make sure all the handlers 
+   are also modified:  checkRd, Rd2HTML, Rd2latex, Rd2txt, any other new ones... */
+
 static keywords[] = {
     /* These sections contain Latex-like text */
 

src/main/gramRd.y

@@ -985,6 +985,10 @@ struct {
     char *name;
     int token;
 }
+
+/* When adding keywords here, make sure all the handlers 
+   are also modified:  checkRd, Rd2HTML, Rd2latex, Rd2txt, any other new ones... */
+
 static keywords[] = {
     /* These sections contain Latex-like text */