fix para breaks in Rd2HTML(): handle indented \Sexpr, skip inactive #ifdef

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

Author: smeyer

src/library/tools/R/Rd2HTML.R

@@ -1,6 +1,6 @@
 #  File src/library/tools/R/Rd2HTML.R
 #
-#  Copyright (C) 1995-2024 The R Core Team
+#  Copyright (C) 1995-2025 The R Core Team
 #  Part of the R package, https://www.R-project.org
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -452,16 +452,19 @@ Rd2HTML <-
     }
 
     skipNewline <- FALSE
+    linestart <- TRUE
     of0 <- function(...)
         of1(paste0(...))
     of1 <- function(text) {
+        force(text) # use skipNewline
         if (skipNewline) {
             skipNewline <<- FALSE
             if (text == "\n") return()
         }
     	if (concordance)
     	    conc$addToConcordance(text)
         writeLinesUTF8(text, con, outputEncoding, sep = "")
+        linestart <<- endsWith(text, "\n")
     }
 
     pendingClose <- pendingOpen <- character()  # Used for infix methods
@@ -513,13 +516,14 @@ Rd2HTML <-
                    "\\verb"="&#8288;</code>")
 
     addParaBreaks <- function(x) {
-	if (isBlankLineRd(x) && isTRUE(inPara)) {
+	if (isTRUE(inPara) && #isBlankLineRd(x)
+	    linestart && grepl("^[[:blank:]]*\n", x)) {
 	    inPara <<- FALSE
 	    return("</p>\n")
 	}
-	## TODO: can we get 'start col' if no srcref ?
+	## remove indentation (for cleaner/smaller output)
 	if (utils:::getSrcByte(x) == 1L) x <- psub("^\\s+", "", x)
-	if (isFALSE(inPara) && !all(grepl("^[[:blank:]\n]*$", x, perl = TRUE))) {
+	if (isFALSE(inPara) && !isBlankRd(x)) {
 	    x <- paste0("<p>", x)
 	    inPara <<- TRUE
 	}
@@ -753,7 +757,8 @@ Rd2HTML <-
                VERB = if (Rhtml && blocktag == "\\dontrun") of1(block)
                       else of1(vhtmlify(block, inEqn)),
                RCODE = if (Rhtml) of1(block) else of1(vhtmlify(block)),
-               TEXT = of1(if(doParas && !inAsIs) addParaBreaks(htmlify(block)) else vhtmlify(block)),
+               TEXT = of1(if (doParas && !inAsIs && !skipNewline) addParaBreaks(htmlify(block))
+                          else vhtmlify(block)),
                USERMACRO =,
                "\\newcommand" =,
                "\\renewcommand" = {},
@@ -807,7 +812,7 @@ Rd2HTML <-
                	   of0(closing)
                	   inPara <<- savePara
                },
-               "\\Sexpr"= of0(as.character.Rd(block, deparse=TRUE)),
+               "\\Sexpr"= of1(paste(as.character.Rd(block, deparse=TRUE), collapse="")),
                "\\cr" =,
                "\\dots" =,
                "\\ldots" =,

src/library/tools/R/RdConv2.R

@@ -25,6 +25,7 @@ RdTags <- function(Rd) {
 isBlankRd <- function(x)
     length(grep("^[[:blank:]]*\n?$", x, perl = TRUE)) == length(x) # newline optional
 
+## not suitable for \Sexpr-generated Rd where the srcref refers to the \Sexpr
 isBlankLineRd <- function(x) {
     utils:::getSrcByte(x) == 1L &&
     length(grep("^[[:blank:]]*\n", x, perl = TRUE)) == length(x)   # newline required

src/library/tools/R/RdHelpers.R

@@ -192,7 +192,7 @@ function(x)
     paste(sprintf("\\if{html}{\u2060\\out{<span id=\"reference+%s\">}}%s\\if{html}{\\out{</span>}}",
                   string2id(unlist(y$key, use.names = FALSE)),
                   toRd(y)),
-          collapse = "\\if{html}{\\out{</p>}}\n\n\\if{html}{\\out{<p>}}")
+          collapse = "\n\n")
 }
 
 Rd_expr_bibcite_keys_cited <- local({

tests/Pkgs/exSexpr/man/a.Rd

@@ -49,8 +49,7 @@ foo(<var>x</var>, <var>y</var>, ...)
 <p>Included
 
 conditional content.
-</p>
-<p>End(<code style="white-space: pre;">&#8288;#ifdef&#8288;</code>).
+End(<code style="white-space: pre;">&#8288;#ifdef&#8288;</code>).
 </p>
 <p>Escaped backslash <code>\x</code>.
 </p>
@@ -105,10 +104,10 @@ output
 </p>
 <p>Georgi Boshnakov's example of generated paragraphs:
 a
-
-b
-
-c
+</p>
+<p>b
+</p>
+<p>c
 </p>