From 74c2b5430fbffa46d791b3fd410964fe9b92bcf6 Mon Sep 17 00:00:00 2001 From: John Fox Date: Sun, 13 Oct 2024 12:05:14 -0400 Subject: [PATCH] Fix bug in print.latexMatrix(sparse=TRUE) --- NEWS.md | 2 ++ R/latexMatrix.R | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3352b49..c732c5c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,8 @@ - Rename vignettes to put them in order - Add `papers/matlib-useR-2016.pdf` to avoid bad URL +- Consolidate options for `print.latexMatrix` +- Fix bug in `print.latexMatrix(sparse=TRUE)` # matlib 1.0.0 diff --git a/R/latexMatrix.R b/R/latexMatrix.R index d60b919..57e69b6 100644 --- a/R/latexMatrix.R +++ b/R/latexMatrix.R @@ -555,7 +555,7 @@ latexMatrix <- function( body <- unname(do.call(rbind, splt)) # matrix of LaTeX cells body <- sub(" *$", "", sub("^ *", "", body)) if(sparse) - mat.result <- gsub('[[:blank:]]+0[[:blank:]]+', ' ', mat.result) + mat.result <- gsub('[[:blank:]]*0[[:blank:]]*', ' ', mat.result) if (!is.null(rownames)){ rownames <- as.character(rownames) @@ -771,7 +771,7 @@ print.latexMatrix <- function(x, onConsole=TRUE, cell.spacing <- "e" if (is.null(colname.spacing) || is.na(colname.spacing)) colname.spacing <- "i" - if (is.null(text.labels) || is.na(text.labels)) + if (is.null(text.labels) || all(is.na(text.labels))) text.labels <- c("row"=FALSE, "column"=FALSE) if (is.null(display.labels) || is.na(display.labels)) display.labels <- TRUE