fix processing multi-line Rd \Sexpr code

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

Author: smeyer

src/library/tools/R/RdConv2.R

@@ -1,7 +1,7 @@
 #  File src/library/tools/R/RdConv2.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2024 The R Core Team
+#  Copyright (C) 1995-2025 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -221,7 +221,8 @@ processRdChunk <- function(code, stage, options, env, macros)
 	code <- structure(code[tags != "COMMENT"],
 	                  srcref = codesrcref) # retain for error locations
 	chunkexps <- tryCatch(
-	    parse(text = as.character(code), keep.source = options$keep.source),
+	    parse(text = sub("\n$", "", as.character(code)),
+	          keep.source = options$keep.source),
 	    error = function (e) stopRd(code, Rdfile, conditionMessage(e))
 	)
 

src/library/tools/R/RdHelpers.R

@@ -321,7 +321,7 @@ function(key, field, value)
 {
     Rd_expr_bibinfo_data_store(list(trimws(key),
                                     trimws(field),
-                                    gsub("\n\n", "\n", trimws(value))),
+                                    trimws(value)),
                                add = TRUE)
 }
 

tests/testit.html.save

@@ -110,7 +110,7 @@ a
 <p>c
 </p>
 <p><code style="white-space: pre;">&#8288;
-[1] "a\n\n    b\n    c"
+[1] "a\n    b\n    c"
 &#8288;</code>
 </p>
 

tests/testit.tex.save

@@ -81,7 +81,7 @@ b
 c
 
 \AsIs{\texttt{
-[1] "a\bsl{}n\bsl{}n    b\bsl{}n    c"
+[1] "a\bsl{}n    b\bsl{}n    c"
 }}
 \end{Section}
 %

tests/testit.txt.save

@@ -68,7 +68,7 @@ _V_a_l_u_e:
 
      c
 
-     [1] "a\n\n    b\n    c"
+     [1] "a\n    b\n    c"
 
 \_t_a_b_u_l_a_r: