Make \abbr part of Rd.

git-svn-id: https://svn.r-project.org/R/trunk@85516 00db46b3-68df-0310-9c12-caf00c1e9a41
r-devel · Nov 13, 2023 · 682b3c1 · 682b3c1
1 parent 41c7dd6
commit 682b3c1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/share/Rd/macros/system.Rd b/share/Rd/macros/system.Rd
@@ -54,4 +54,4 @@
 \newcommand{\proglang}{\ifelse{latex}{\out{\textsf{#1}}}{#1}}
 
 % To indicate an abbreviation.
-\newcommand{\abbr}{#1}
+% \newcommand{\abbr}{#1}
diff --git a/src/library/tools/R/Rd2HTML.R b/src/library/tools/R/Rd2HTML.R
@@ -473,7 +473,8 @@ Rd2HTML <-
     		     "\\dots"="...",
     		     "\\ldots"="...")
     ## These correspond to idiosyncratic wrappers
-    HTMLLeft <- c("\\acronym"='<abbr><span class="acronym">',
+    HTMLLeft <- c("\\abbr"='<abbr>',
+                  "\\acronym"='<abbr><span class="acronym">',
     		  "\\donttest"="",
     		  "\\env"='<span class="env">',
                   "\\file"='&lsquo;<span class="file">',
@@ -483,7 +484,8 @@ Rd2HTML <-
                   "\\sQuote"="&lsquo;",
                   "\\dQuote"="&ldquo;",
                   "\\verb"='<code style="white-space: pre;">&#8288;')
-    HTMLRight <- c("\\acronym"='</span></abbr>',
+    HTMLRight <- c("\\abbr"="</abbr>",
+                   "\\acronym"='</span></abbr>',
     		   "\\donttest"="",
     		   "\\env"="</span>",
                    "\\file"='</span>&rsquo;',
@@ -792,6 +794,7 @@ Rd2HTML <-
                    enterPara(doParas)
                	   of1(HTMLEscapes[tag])
                },
+               "\\abbr" =,
                "\\acronym" =,
                "\\donttest" =,
                "\\env" =,

diff --git a/src/library/tools/R/Rd2latex.R b/src/library/tools/R/Rd2latex.R
@@ -401,6 +401,7 @@ Rd2latex <- function(Rd, out = "", defines = .Platform$OS.type,
                    inCode <<- FALSE
                },
                ## simple wrappers
+               "\\abbr" =,
                "\\acronym" =,
                "\\bold"=,
                "\\dfn"=,

diff --git a/src/library/tools/R/Rd2txt.R b/src/library/tools/R/Rd2txt.R
@@ -622,6 +622,7 @@ Rd2txt <-
   			put(" <", utils::URLencode(lines2str(as.character(block[[1L]]))), ">")
                },
                "\\Sexpr"= put(as.character.Rd(block, deparse=TRUE)),
+               "\\abbr" =,
                "\\acronym" =,
                "\\cite"=,
                "\\dfn"= ,

diff --git a/src/library/tools/R/RdConv2.R b/src/library/tools/R/RdConv2.R
@@ -851,6 +851,7 @@ checkRd <- function(Rd, defines = .Platform$OS.type, stages = "render",
                "\\dots" =,
                "\\ldots" =,
                "\\R" = has_text <<- TRUE,
+               "\\abbr" =,
                "\\acronym" =,
                "\\env" =,
                "\\file" =,

diff --git a/src/library/tools/src/gramRd.y b/src/library/tools/src/gramRd.y
@@ -1158,6 +1158,7 @@ static keywords[] = {
 
     /* These macros take one LaTeX-like argument. */
 
+    { "\\abbr",    LATEXMACRO },
     { "\\acronym", LATEXMACRO },
     { "\\bold",    LATEXMACRO },
     { "\\cite",    LATEXMACRO },