tweak c84551

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

Author: smeyer

src/library/tools/R/RdConv2.R

@@ -213,7 +213,7 @@ processRdChunk <- function(code, stage, options, env, macros)
         res <- character(0)
 
         tags <- RdTags(code)
-        if (length(bad <- setdiff(tags, c("RCODE", "COMMENT"))))
+        if (length(bad <- setdiff(tags, c("RCODE", "TEXT", "COMMENT"))))
             ## also USERMACROs are currently not supported inside \Sexpr{}
             warnRd(code, Rdfile, "\\Sexpr expects R code; found ",
                    paste0(sQuote(bad), collapse = ", "))
@@ -379,6 +379,7 @@ processRdIfdefs <- function(blocks, defines)
                         tagged(list(
                             tagged(paste(tag, target, "not active"),
                                    "COMMENT", attr(block, "srcref")),
+                            ## converters expect (and drop) newline from COMMENT
                             tagged("\n",
                                    "TEXT", attr(block, "srcref"))
                         ), "#expanded")

tests/reg-packages.R

@@ -478,7 +478,8 @@ stopifnot(exprs = {
 any(grepl("See Also:", helptxt, fixed = TRUE)) == (.Platform$OS.type == "windows")
 
 ## post-build macros can contain conditional defines
-tools::Rd2txt(installedRdDB[["nestedDefinesOK.Rd"]])
+tools::Rd2txt(installedRdDB[["nestedDefinesOK.Rd"]],
+              options = list(underline_titles = FALSE))
 deparsedLines <- as.character(installedRdDB[["nestedDefinesOK.Rd"]])
 stopifnot(("unix" %in% deparsedLines) == (.Platform$OS.type == "unix"),
           ("windows" %in% deparsedLines) == (.Platform$OS.type == "windows"))