v1.0.6 CRAN

brodieG · May 18, 2024 · 1000916 · 1000916
2 parents edb5fee + 266b183
commit 1000916
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 14 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -5,7 +5,8 @@
 ^CONTRIBUTING\.md$
 ^CRAN\.md$
 ^\.travis\.yml$
-.Rdata
+\.Rdata
+\.Rhistory
 ^covr\.R
 ^extra$
 ^scratch

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: fansi
 Title: ANSI Control Sequence Aware String Functions
 Description: Counterparts to R string manipulation functions that account for
    the effects of ANSI text formatting control sequences.
-Version: 1.0.5
+Version: 1.0.6
 Authors@R: c(
     person("Brodie", "Gaslam", email="brodie.gaslam@yahoo.com",
     role=c("aut", "cre")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # fansi Release Notes
 
+## v1.0.6
+
+* Fix new `-Wformat` warnings.
+
 ## v1.0.5
 
 * Address roxygen2 breaking changes:

diff --git a/R/fansi-package.R b/R/fansi-package.R
@@ -44,7 +44,7 @@
 #' _Control Sequences_ starting with ESC are assumed to be two characters
 #' long (including the ESC) unless they are of the CSI or OSC variety, in which
 #' case their length is computed as per the [ECMA-48
-#' specification](https://www.ecma-international.org/publications-and-standards/standards/ecma-48/),
+#' specification](https://ecma-international.org/publications-and-standards/standards/ecma-48/),
 #' with the exception that [OSC hyperlinks](#osc-hyperlinks) may be terminated
 #' with BEL ("\\a") in addition to ST ("ESC\\").  `fansi` handles most common
 #' _Control Sequences_ in its parsing algorithms, but it is not a conforming

diff --git a/README.Rmd b/README.Rmd
@@ -198,7 +198,7 @@ master branch typically mirrors CRAN and should be stable.
 * [ansistrings](https://github.com/r-lib/ansistrings/), which implements similar
   functionality.
 * [ECMA-48 - Control Functions For Coded Character
-  Sets](https://www.ecma-international.org/publications-and-standards/standards/ecma-48/),
+  Sets](https://ecma-international.org/publications-and-standards/standards/ecma-48/),
   in particular pages 10-12, and 61.
 * [CCITT Recommendation T.416](https://www.itu.int/rec/dologin_pub.asp?lang=e&id=T-REC-T.416-199303-I!!PDF-E&type=items)
 * [ANSI Escape Code - Wikipedia](https://en.wikipedia.org/wiki/ANSI_escape_code)

diff --git a/README.md b/README.md
@@ -132,8 +132,12 @@ including combining emoji:
 You can translate ANSI CSI SGR formatted strings into their HTML
 counterparts with `to_html`:
 
-![Translate to
-HTML](https://github.com/brodieG/fansi/raw/v1.0-rc/extra/images/sgr_to_html.png)
+<figure>
+<img
+src="https://github.com/brodieG/fansi/raw/v1.0-rc/extra/images/sgr_to_html.png"
+alt="Translate to HTML" />
+<figcaption aria-hidden="true">Translate to HTML</figcaption>
+</figure>
 
 ## Rmarkdown
 
@@ -172,7 +176,7 @@ working. The master branch typically mirrors CRAN and should be stable.
 -   [ansistrings](https://github.com/r-lib/ansistrings/), which
     implements similar functionality.
 -   [ECMA-48 - Control Functions For Coded Character
-    Sets](https://www.ecma-international.org/publications-and-standards/standards/ecma-48/),
+    Sets](https://ecma-international.org/publications-and-standards/standards/ecma-48/),
     in particular pages 10-12, and 61.
 -   [CCITT Recommendation
     T.416](https://www.itu.int/rec/dologin_pub.asp?lang=e&id=T-REC-T.416-199303-I!!PDF-E&type=items)

diff --git a/man/fansi.Rd b/man/fansi.Rd
diff --git a/man/strtrim_ctl.Rd b/man/strtrim_ctl.Rd
diff --git a/man/strtrim_sgr.Rd b/man/strtrim_sgr.Rd
diff --git a/man/trimws_ctl.Rd b/man/trimws_ctl.Rd
diff --git a/src/unhandled.c b/src/unhandled.c
@@ -134,7 +134,6 @@ SEXP FANSI_unhandled_esc(SEXP x, SEXP term_cap) {
     if(res == R_NilValue)
       // nocov start
       error(
-        "%s%s",
         "Internal Error: mismatch between list and err count; "
         "contact maintainer."
       );

diff --git a/src/wrap.c b/src/wrap.c
@@ -102,7 +102,7 @@ static struct FANSI_prefix_dat drop_pre_indent(struct FANSI_prefix_dat dat) {
   if(dat.indent < 0)
     // nocov start
     error(
-      "Internal Error: cannot drop indent when there is none; contact ",
+      "Internal Error: cannot drop indent when there is none; contact "
       "maintainer."
     );
     // nocov end

diff --git a/src/write.c b/src/write.c
@@ -717,7 +717,7 @@ static char * color_token(
     // nocov start
     error(
       "Internal Error: exceeded color buffer (%d vs %d).",
-      buff_track - buff, CLR_BUFF_SIZE
+      (int) (buff_track - buff), CLR_BUFF_SIZE
     );
     // nocov end
   return buff;