Update themes to be consistent with Andrew Simon's highlight. (#2341)

Co-authored-by: dcser123 <[email protected]> Co-authored-by: Yihui Xie <[email protected]>
yihui · May 23, 2024 · f1788b8 · f1788b8
1 parent aa34f1b
commit f1788b8
Show file tree

Hide file tree

Showing 89 changed files with 179 additions and 174 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -198,3 +198,4 @@ Collate:
  'utils-vignettes.R'
  'zzz.R'
 RoxygenNote: 7.3.1
+Remotes: yihui/highr
diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,10 @@
 
 - `write_bib()` now escapes all non-escaped "&" in the bibliography by default. Previously, it only escaped the title field of the package citation. You can disable the escape with the argument `tweak = FALSE` (thanks, @HedvigS #2335, @atusy #2342).
 
+## MINOR CHANGES
+
+- The syntax highlighting LaTeX commands for Rnw documents, `\hlstr` and `\hlstd`, were renamed to `\hlsng` and `\hldef`, respectively, to maintain consistency with Andrew Simon's highlight package (thanks, @dcser123, #2341).
+
 # CHANGES IN knitr VERSION 1.46
 
 ## NEW FEATURES

diff --git a/R/highlight.R b/R/highlight.R
@@ -30,7 +30,7 @@ hilight_source = function(x, format, options) {
 
 highlight_header = function() {
  set_header(highlight.extra = paste(c(
- sprintf('\\let\\hl%s\\hlstd', c('esc', 'pps', 'lin')),
+ sprintf('\\let\\hl%s\\hldef', c('esc', 'pps', 'lin')),
  sprintf('\\let\\hl%s\\hlcom', c('slc', 'ppc'))
  ), collapse = ' '))
 }

diff --git a/R/themes.R b/R/themes.R
@@ -66,7 +66,7 @@ theme_to_header_latex = function(theme) {
 
  # get background and foreground colors
  background = css_out$background$color
- foreground = css_out$std$color
+ foreground = css_out$def$color
 
  # write latex highlight header
  fgheader = color_def(foreground, 'fgcolor')
@@ -114,8 +114,8 @@ theme2list = function(theme.file) {
 
 # mapping between CSS class and Highlight theme elements
 cls2thm = c(
- background = 'Canvas', num = 'Number', str = 'String', com = 'BlockComment',
- opt = 'Operator', std = 'Default',
+ background = 'Canvas', num = 'Number', sng = 'String', com = 'BlockComment',
+ opt = 'Operator', def = 'Default',
  kwa = 'Keyword1', kwb = 'Keyword2', kwc = 'Keyword3', kwd = 'Keyword4'
 )
 

diff --git a/inst/themes/acid.css b/inst/themes/acid.css
@@ -5,7 +5,7 @@
  color: #800080;
  font-weight: bold;
 }
-.str {
+.sng {
  color: #a68500;
 }
 .com {
@@ -15,7 +15,7 @@
  color: #ff0080;
  font-weight: bold;
 }
-.std {
+.def {
  color: #000000;
 }
 .kwa {

diff --git a/inst/themes/aiseered.css b/inst/themes/aiseered.css
@@ -4,7 +4,7 @@
 .num {
  color: #88ddee;
 }
-.str {
+.sng {
  color: #ffcc88;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
  color: #ffcc33;
 }
-.std {
+.def {
  color: #f08080;
 }
 .kwa {

diff --git a/inst/themes/andes.css b/inst/themes/andes.css
@@ -4,7 +4,7 @@
 .num {
  color: #dfaf87;
 }
-.str {
+.sng {
  color: #ffff77;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #ff00cc;
 }
-.std {
+.def {
  color: #f0f0f0;
 }
 .kwa {

diff --git a/inst/themes/anotherdark.css b/inst/themes/anotherdark.css
@@ -4,7 +4,7 @@
 .num {
  color: #ffa0a0;
 }
-.str {
+.sng {
  color: #ffa0a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #dedede;
 }
-.std {
+.def {
  color: #dedede;
 }
 .kwa {

diff --git a/inst/themes/autumn.css b/inst/themes/autumn.css
@@ -4,7 +4,7 @@
 .num {
  color: #00884c;
 }
-.str {
+.sng {
  color: #00884c;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #404040;
 }
-.std {
+.def {
  color: #404040;
 }
 .kwa {

diff --git a/inst/themes/baycomb.css b/inst/themes/baycomb.css
@@ -4,7 +4,7 @@
 .num {
  color: #4580b4;
 }
-.str {
+.sng {
  color: #5c78f0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #b0b0b0;
 }
-.std {
+.def {
  color: #a0b4e0;
 }
 .kwa {

diff --git a/inst/themes/bclear.css b/inst/themes/bclear.css
@@ -4,7 +4,7 @@
 .num {
  color: #1094a0;
 }
-.str {
+.sng {
  color: #1094a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #323232;
 }
-.std {
+.def {
  color: #323232;
 }
 .kwa {

diff --git a/inst/themes/biogoo.css b/inst/themes/biogoo.css
@@ -4,7 +4,7 @@
 .num {
  color: #b85d00;
 }
-.str {
+.sng {
  color: #d10000;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #000000;
 }
-.std {
+.def {
  color: #000000;
 }
 .kwa {

diff --git a/inst/themes/bipolar.css b/inst/themes/bipolar.css
@@ -4,7 +4,7 @@
 .num {
  color: #0083c9;
 }
-.str {
+.sng {
  color: #eba236;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
  color: #e3d922;
 }
-.std {
+.def {
  color: #d62b9a;
 }
 .kwa {

diff --git a/inst/themes/blacknblue.css b/inst/themes/blacknblue.css
@@ -4,7 +4,7 @@
 .num {
  color: #cc3366;
 }
-.str {
+.sng {
  color: #cfc631;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
  color: #ccc6c6;
 }
-.std {
+.def {
  color: #22a0d6;
 }
 .kwa {

diff --git a/inst/themes/bluegreen.css b/inst/themes/bluegreen.css
@@ -5,7 +5,7 @@
  color: #72A5E4;
  font-weight: bold;
 }
-.str {
+.sng {
  color: #72A5E4;
  font-weight: bold;
 }
@@ -16,7 +16,7 @@
 .opt {
  color: #ffffff;
 }
-.std {
+.def {
  color: #ffffff;
 }
 .kwa {

diff --git a/inst/themes/breeze.css b/inst/themes/breeze.css
@@ -4,7 +4,7 @@
 .num {
  color: #60ffff;
 }
-.str {
+.sng {
  color: #60ffff;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #ffffff;
 }
-.std {
+.def {
  color: #ffffff;
 }
 .kwa {

diff --git a/inst/themes/bright.css b/inst/themes/bright.css
@@ -4,7 +4,7 @@
 .num {
  color: #32ba06;
 }
-.str {
+.sng {
  color: #1861a7;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #555555;
 }
-.std {
+.def {
  color: #330066;
 }
 .kwa {

diff --git a/inst/themes/camo.css b/inst/themes/camo.css
@@ -4,7 +4,7 @@
 .num {
  color: #d2691e;
 }
-.str {
+.sng {
  color: #ffe4b5;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #ffe4c4;
 }
-.std {
+.def {
  color: #ffe4c4;
 }
 .kwa {

diff --git a/inst/themes/candy.css b/inst/themes/candy.css
@@ -4,7 +4,7 @@
 .num {
  color: #90d0ff;
 }
-.str {
+.sng {
  color: #90d0ff;
 }
 .com {
@@ -14,7 +14,7 @@
 .opt {
  color: #f0f0f8;
 }
-.std {
+.def {
  color: #f0f0f8;
 }
 .kwa {

diff --git a/inst/themes/clarity.css b/inst/themes/clarity.css
@@ -4,7 +4,7 @@
 .num {
  color: #b3ee3a;
 }
-.str {
+.sng {
  color: #cccccc;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #b2dfee;
 }
-.std {
+.def {
  color: #b2dfee;
 }
 .kwa {

diff --git a/inst/themes/dante.css b/inst/themes/dante.css
@@ -4,7 +4,7 @@
 .num {
  color: #ee0000;
 }
-.str {
+.sng {
  color: #cd2626;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #cdaf96;
 }
-.std {
+.def {
  color: #cdaf96;
 }
 .kwa {

diff --git a/inst/themes/darkblue.css b/inst/themes/darkblue.css
@@ -4,7 +4,7 @@
 .num {
  color: #42cad9;
 }
-.str {
+.sng {
  color: #ffa0a0;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #bababa;
 }
-.std {
+.def {
  color: #ffffff;
 }
 .kwa {

diff --git a/inst/themes/darkbone.css b/inst/themes/darkbone.css
@@ -4,7 +4,7 @@
 .num {
  color: #d0e080;
 }
-.str {
+.sng {
  color: #d0e080;
 }
 .com {
@@ -13,7 +13,7 @@
 .opt {
  color: #cccccc;
 }
-.std {
+.def {
  color: #a0a0c0;
 }
 .kwa {