Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- uses: r-lib/actions/setup-tinytex@v2
- run: tlmgr --version
- run: tlmgr install colortbl grfext ae tabu
- run: tlmgr install colortbl grfext ae
- run: tlmgr list --only-installed
- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: tables
Title: Formula-Driven Table Generation
Version: 0.9.33
Version: 0.9.35
Authors@R: person(given = "Duncan",
family = "Murdoch",
role = c("aut", "cre"),
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# tables 0.9.35

- The vignettes no longer use the LaTeX tabu package.

# tables 0.9.33

Expand Down
9 changes: 3 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# tables 0.9.34
# tables 0.9.35

Correct URLs.

# tables 0.9.33

This is a small update, fixing missing vignettes.
This is a small release to remove the dependence on the
LaTeX tabu package, on request from CRAN.
6 changes: 4 additions & 2 deletions vignettes/knitrTables.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ vignette: >
bibliography: tables.bib
header-includes:
\usepackage{booktabs}
\usepackage{tabu}
---

```{r setup, include=FALSE}
Expand Down Expand Up @@ -1279,7 +1278,10 @@ the 4th column is changed.
These features require additional \LaTeX\ packages; see the
`kableExtra` documentation for details.

```{r}

NB: Currently this code requires the LaTeX \verb!tabu!
package, which is not supported in recent LaTeX releases, so it is not evaluated.
```{r, eval=FALSE}
library(magrittr)
library(kableExtra)
toKable(tab) %>%
Expand Down
6 changes: 4 additions & 2 deletions vignettes/tables.Rnw
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
\usepackage{array}
\usepackage[table]{xcolor}
\usepackage{colortbl}
\usepackage{tabu}
\usepackage{Sweave}

\usepackage[authoryear,round,comma]{natbib}
Expand Down Expand Up @@ -1311,7 +1310,10 @@ the 4th column is changed.
These features require additional \LaTeX\ packages; see the
\pkg{kableExtra} documentation for details.

<<results=tex>>=
NB: Currently this code requires the LaTeX \verb!tabu!
package, which is not supported in recent LaTeX releases, so it is not evaluated.

<<eval=FALSE>>=
library(magrittr)
library(kableExtra)
toKable(tab) %>%
Expand Down
20 changes: 1 addition & 19 deletions vignettes/tables.Rout.save
Original file line number Diff line number Diff line change
Expand Up @@ -944,24 +944,6 @@ B & 2 & $10$ & $14.4$ & $2.836$ & $56.3$ & $7.889$ \\
\bottomrule
\end{tabular}

> library(magrittr)

> library(kableExtra)

> toKable(tab) %>% kable_styling(full_width = TRUE) %>%
+ column_spec(4, color = "red")
\begin{tabu} to \linewidth {>{\raggedright}X>{\raggedright}X>{\centering}X>{}c>{\centering}X>{\centering}X>{\centering}X}
\toprule
& & & \multicolumn{2}{c}{New label} & \multicolumn{2}{c}{c} \\ \cmidrule(lr){4-5}\cmidrule(lr){6-7}
& a & N & mean & sd & mean & \multicolumn{1}{c}{sd} \\
\midrule
A & 1 & $10$ & \textcolor{red}{$14.4$} & $3.026$ & $55.7$ & $6.447$ \\
& 3 & $10$ & \textcolor{red}{$14.5$} & $2.877$ & $52.8$ & $8.954$ \\
B & 2 & $10$ & \textcolor{red}{$14.4$} & $2.836$ & $56.3$ & $7.889$ \\
\bottomrule
\end{tabu}


> latexTable(tabular((Species + 1) ~ (n = 1) + Format(digits = 2) *
+ (Sepal.Length + Sepal.Width) * (mean + sd), data = iris),
+ caption = .... [TRUNCATED]
Expand All @@ -986,4 +968,4 @@ All & $150$ & $5.84$ & $0.83$ & $3.06$ & $0.44$ \\
*** Run successfully completed ***
> proc.time()
user system elapsed
0.561 0.024 0.584
0.515 0.020 0.532