tweak r89379 and fix typo from r89322

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

Author: smeyer

src/library/tools/R/bibtools.R

@@ -1,7 +1,7 @@
 #  File src/library/tools/R/bibtools.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 2025 The R Core Team
+#  Copyright (C) 2025-2026 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
@@ -174,14 +174,16 @@ function(bib)
 function(dir)
 {
     dir <- file_path_as_absolute(dir)
-    
+
     ## Base packages are special as they have no partial Rd db, and
-    ## Rd_db() re-orders sections after processing Sexprs, so we need to 
+    ## Rd_db() re-orders sections after processing Sexprs, so we need to
     ## go via .build_Rd_db() which allows step control.
     ## For non-base packages, we really need build/partial.rdb (which we
     ## only have for the package sources) to check that all bibentry
     ## macros were properly expanded.
-    db <- .build_Rd_db(dir, step = 1L)
+    ## There is no need to process \Sexpr code here (and we are not
+    ## prepared to find the installed package/REFERENCES anyway).
+    db <- .build_Rd_db(dir, step = 1L, stages = NULL)
     if(length(db)) {
         first <- nchar(file.path(dir, "man")) + 2L
         names(db) <- substring(names(db), first)
@@ -190,33 +192,34 @@ function(dir)
     x <- Filter(length, lapply(db, .bibentries_cited_or_shown))
     if(!length(x))
         return(NULL)
-    
+
     u <- FALSE
-    
+
     if(basename(dir) %notin% .get_standard_package_names()$base) {
         ## Check whether we got everything from the build stage
         ## expansions.
-        f <- file.path(dir, "build", "partial.rdb")
-        if(!file.exists(f)) {
+        built_file <- file.path(dir, "build", "partial.rdb")
+        if(!file.exists(built_file)) {
             u <- TRUE
         } else {
-            y <- lapply(readRDS(f)[names(x)], .bibentries_cited_or_shown)
+            y <- lapply(readRDS(built_file)[names(x)],
+                        .bibentries_cited_or_shown)
             ## Cannot simply use identical() as entries in the partial
             ## Rd db are subject to section re-ordering.
             ## <FIXME>
             ## Is this still true now that we go via .build_Rd_db()?
             ## </FIXME>
             g <- function(u, v) {
                 is.null(v) || # built with \bib stubs/unknowns in R < 4.6.0
-                    length(setdiff(split(u, row(u)), split(v, row(v))) > 0L)
+                    length(setdiff(split(u, row(u)), split(v, row(v)))) > 0L
             }
             if(any(unlist(Map(g, x, y), use.names = FALSE)))
                 u <- TRUE
             else
                 x <- y
         }
     }
-    
+
     f <- function(x) {
         if(!length(x))
             return(NULL)