From 4b9ee94b571feab7b20e4e43d627408e33da1c03 Mon Sep 17 00:00:00 2001 From: Jan Marvin Garbuszus Date: Fri, 26 May 2023 10:12:00 +0200 Subject: [PATCH] Release 0.7 (#626) * bump version * fix typos update wordlist * revdepcheck run - No changes to commit --------- Co-authored-by: GitHub Actions --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/class-workbook-wrappers.R | 2 +- inst/WORDLIST | 31 +++++++++++++++++++++++++++- man/wb_set_sheetview.Rd | 2 +- revdep/README.md | 6 +++--- vignettes/openxlsx2_style_manual.Rmd | 2 +- 7 files changed, 38 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8721c47f7..5a064a950 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: openxlsx2 Title: Read, Write and Edit 'xlsx' Files -Version: 0.6.1.9000 +Version: 0.7 Language: en-US Authors@R: c( person("Jordan Mark", "Barbone", email = "jmbarbone@gmail.com", role = "aut", comment = c(ORCID = "0000-0001-9788-3628")), diff --git a/NEWS.md b/NEWS.md index 6b9a3e942..976069d50 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# openxlsx2 (in development) +# openxlsx2 (0.7) ## New features diff --git a/R/class-workbook-wrappers.R b/R/class-workbook-wrappers.R index d63432fe4..b5be44a73 100644 --- a/R/class-workbook-wrappers.R +++ b/R/class-workbook-wrappers.R @@ -2944,7 +2944,7 @@ wb_add_ignore_error <- function( #' @param showRowColHeaders Logical: if TRUE row and column headers are shown #' @param showRuler Logical: if TRUE a ruler is shown in page layout view #' @param showWhiteSpace Logical: if TRUE margins are shown in page layout view -#' @param showZeros Logical: if FALSE cells containg zero are shown blank if !showFormulas +#' @param showZeros Logical: if FALSE cells containing zero are shown blank if !showFormulas #' @param tabSelected Integer: zero vector indicating the selected tab #' @param topLeftCell Cell: the cell shown in the top left corner / or top right with rightToLeft #' @param view View: "normal", "pageBreakPreview" or "pageLayout" diff --git a/inst/WORDLIST b/inst/WORDLIST index 046efe59b..76efca35e 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,6 +1,8 @@ ARGB Arial ArrowsGray +CHARSET +CHINESEBIG CMD COUNTA Calibri @@ -9,21 +11,26 @@ Colorscale DL Databars Dropmenu +EASTEUROPE ExcelDate FFFFC FFFFFF Github Gnumeric GrossProfit +Interger JIS +JOHAB LastModifiedBy Libreoffice +OEM Openoffice POSIXct POSIXt Philipp Radiobuttons RedToBlack +SHIFTJIS STDEV STDEVP SalesPrice @@ -49,6 +56,7 @@ bgFill bool calc calcChain +calculatedColumn cellWatches charset chartShapes @@ -97,13 +105,14 @@ defaultPivotStyle defaultTableStyle detectDates df -difftime displayEmptyCellsAs drawingHF dxf dxfs eg embeddings +emptyCellReference +evalError evenFooter evenHeader extLst @@ -118,15 +127,20 @@ firstActiveCol firstActiveRow firstCol firstColumn +firstColumnStripe firstFooter firstHeader +firstHeaderCell firstRow +firstRowStripe firstSheet +firstTotalCell fitToHeight fitToWidth fontColor fontName fontSize +formulaRange freezePane gc github @@ -141,8 +155,12 @@ hasDrawing hdpi headFoot headerFooter +headerRow +hms ignoredErrors lastColumn +lastHeaderCell +lastTotalCell legacyDrawing legacyDrawingHF lessThan @@ -154,6 +172,7 @@ lightHorizontal lightTrellis lightUp lightVertical +listDataValidation localName localSheet lockStructure @@ -173,6 +192,7 @@ nestings notBetween notEqual numFmt +numberStoredAsText numfmt numfmts oddFooter @@ -182,6 +202,8 @@ oneCellAnchor openxlsx openxml ou +pageBreakPreview +pageLayout pageMargins pageSetup paperSize @@ -216,6 +238,8 @@ rowNames rowOffset rowname sapply +secondColumnStripe +secondRowStripe sep sharedStrings sheetCalcPr @@ -270,11 +294,14 @@ th threadComments threadedComments topLeftCell +totalRow totalsRowCount twoCellAnchor +twoDigitTextYear unescaping ungroup unicode +unlockedFormula unprotect vbaProject vdpi @@ -282,10 +309,12 @@ veryHidden vm vml wb +wbColor wbColour wbProcedure wbWorkbook webPublishItems +wholeTable windowHeight windowProtection windowWidth diff --git a/man/wb_set_sheetview.Rd b/man/wb_set_sheetview.Rd index 840861d1f..bd6e2a0a1 100644 --- a/man/wb_set_sheetview.Rd +++ b/man/wb_set_sheetview.Rd @@ -49,7 +49,7 @@ wb_set_sheetview( \item{showWhiteSpace}{Logical: if TRUE margins are shown in page layout view} -\item{showZeros}{Logical: if FALSE cells containg zero are shown blank if !showFormulas} +\item{showZeros}{Logical: if FALSE cells containing zero are shown blank if !showFormulas} \item{tabSelected}{Integer: zero vector indicating the selected tab} diff --git a/revdep/README.md b/revdep/README.md index 91d3b674c..24726100d 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -2,7 +2,7 @@ |field |value | |:--------|:----------------------------| -|version |R version 4.2.3 (2023-03-15) | +|version |R version 4.3.0 (2023-04-21) | |os |Ubuntu 20.04.6 LTS | |system |x86_64, linux-gnu | |ui |X11 | @@ -10,14 +10,14 @@ |collate |C.UTF-8 | |ctype |C.UTF-8 | |tz |UTC | -|date |2023-04-21 | +|date |2023-05-26 | |pandoc |2.19.2 @ /usr/bin/pandoc | # Dependencies |package |old |new |Δ | |:---------|:------|:------|:--| -|openxlsx2 |0.6 |0.6.1 |* | +|openxlsx2 |0.6.1 |0.7 |* | |magrittr |2.0.3 |2.0.3 | | |R6 |2.5.1 |2.5.1 | | |Rcpp |1.0.10 |1.0.10 | | diff --git a/vignettes/openxlsx2_style_manual.Rmd b/vignettes/openxlsx2_style_manual.Rmd index b803c917b..ac7d79bf4 100644 --- a/vignettes/openxlsx2_style_manual.Rmd +++ b/vignettes/openxlsx2_style_manual.Rmd @@ -376,7 +376,7 @@ wb <- wb_load(system.file("extdata", "oxlsx2_sheet.xlsx", package = "openxlsx2") # Style strings -Using `fmt_txt()` is possible to style strings indepentenly of the cell containing the string. +Using `fmt_txt()` is possible to style strings independently of the cell containing the string. ```{r} txt <- paste(