Merge pull request #495 from ycphs/4.2.7

4.2.7
ycphs · Aug 30, 2024 · dd19b3c · dd19b3c
2 parents 8b30da6 + c44aa36
commit dd19b3c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: openxlsx
 Title: Read, Write and Edit xlsx Files
-Version: 4.2.6.9000
-Date: 2024-08-01
+Version: 4.2.7
+Date: 2024-08-30
 Authors@R: 
     c(person(given = "Philipp",
              family = "Schauberger",

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# openxlsx (development version)
+# openxlsx 4.2.7
 
 * Fixed warning on `dataValidation(..., type = "list")` ([#342](https://github.com/ycphs/openxlsx/issues/342))
 * Added optional argument to `loadWorkbook` to decide if empty/blank cells should be converted to NA_character_ (the default) or left blank as is

diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -1,4 +1,5 @@
 Arial
+Breuer
 CMD
 Calibri
 Calligra
@@ -12,7 +13,6 @@ Generalised
 Gnumeric
 Italicise
 JIS
-Kainhofer
 LONGDATE
 LastModifiedBy
 Libreoffice
@@ -59,6 +59,7 @@ dateFormat
 datetime
 datetimeFormat
 datetimes
+detectDates
 dev
 df
 eg
@@ -89,6 +90,7 @@ loadWorkbook
 maxWidth
 minWidth
 na
+nestings
 notBetween
 notBlanks
 notContains

diff --git a/vignettes/Formatting.Rmd b/vignettes/Formatting.Rmd
@@ -16,7 +16,7 @@ vignette: >
 library(openxlsx)
 ```
 
-```{r include = TRUE, tidy = TRUE, eval = FALSE, highlight = TRUE}
+```{r include = TRUE, eval = FALSE, highlight = TRUE}
 ## data.frame to write
 df <- data.frame("Date" = Sys.Date()-0:4,
                  "Logical" = c(TRUE, FALSE, TRUE, TRUE, FALSE),
@@ -79,7 +79,7 @@ The 'tableStyle' argument in writeDataTable can be any of the predefined tableSt
 
 ## Date Formatting
 
-```{r include = TRUE, tidy = TRUE, eval = FALSE, highlight = TRUE}
+```{r include = TRUE, eval = FALSE, highlight = TRUE}
 # data.frame of dates
 dates <- data.frame("d1" = Sys.Date() - 0:4)
 for(i in 1:3) dates <- cbind(dates, dates)
@@ -140,7 +140,7 @@ saveWorkbook(wb, "Date Formatting.xlsx", overwrite = TRUE)
 The conversion from POSIX to Excel datetimes is dependent on the timezone you are in.
 If POSIX values are being written incorrectly, try setting the timezone with (for example)
 
-```{r include = TRUE,tidy = TRUE, eval = FALSE, highlight = TRUE}
+```{r include = TRUE, eval = FALSE, highlight = TRUE}
 Sys.setenv(TZ = "Australia/Sydney")
 
 dateTimes <- data.frame("d1" = Sys.time() - 0:4*10000)
@@ -190,7 +190,7 @@ openXL("DateTime Formatting.xlsx")
 
 ## Conditional Formatting
 
-```{r include = TRUE, tidy = TRUE, eval = FALSE, highlight = TRUE}
+```{r include = TRUE, eval = FALSE, highlight = TRUE}
 wb <- createWorkbook()
 addWorksheet(wb, "cellIs")
 addWorksheet(wb, "Moving Row")
@@ -266,7 +266,7 @@ openXL(wb)
 numeric columns styling can be set using the numFmt parameter in createStyle or a default can be 
 set with, for example, options("openxlsx.numFmt" = "#,#0.00")
 
-```{r include = TRUE, tidy = TRUE, eval = FALSE, highlight = TRUE}
+```{r include = TRUE, eval = FALSE, highlight = TRUE}
 options("openxlsx.numFmt" = NULL)
 wb <- createWorkbook()
 addWorksheet(wb, "Sheet 1")