From 29b97876264f2d82c3930c93ffdb712f81157e50 Mon Sep 17 00:00:00 2001
From: Vincent Arel-Bundock <vincent.arel-bundock@umontreal.ca>
Date: Wed, 17 Jan 2024 21:56:14 -0500
Subject: [PATCH] align

---
 R/style_tabularray.R                         |   2 +-
 R/style_tt.R                                 |  16 ++++++++++++++++
 inst/tinytest/_tinysnapshot/html-issue58.rds | Bin 1323 -> 0 bytes
 inst/tinytest/_tinysnapshot/latex-align.txt  |   5 -----
 inst/tinytest/test-html.R                    |   3 ++-
 inst/tinytest/test-latex.R                   |   2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 inst/tinytest/_tinysnapshot/html-issue58.rds

diff --git a/R/style_tabularray.R b/R/style_tabularray.R
index 5d2f7f55..a88711d7 100644
--- a/R/style_tabularray.R
+++ b/R/style_tabularray.R
@@ -37,7 +37,7 @@ style_tabularray <- function(x,
   # colspan requires cell level, so we keep the full settings DF
   if (is.null(colspan)) {
     if (is.null(i) && is.null(j)) {
-      settings <- unique(settings[, c("j", "tabularray"), drop = FALSE])
+      settings <- unique(settings[, c("i", "tabularray"), drop = FALSE])
     } else if (is.null(i)) {
       settings <- unique(settings[, c("j", "tabularray"), drop = FALSE])
     } else if (is.null(j)) {
diff --git a/R/style_tt.R b/R/style_tt.R
index 9ef92226..7e754951 100644
--- a/R/style_tt.R
+++ b/R/style_tt.R
@@ -115,6 +115,22 @@ style_tt_lazy <- function (x,
 
   # align can be "c" or "clrrlc"takes many possible values
   assert_string(align, null.ok = TRUE)
+
+  if (!is.null(align)) {
+    if (nchar(align) == 1) {
+      assert_choice(align, c("c", "l", "r"))
+    } else {
+      align_split <- strsplit(align, split = "")[[1]]
+      for (align_character in align_split){
+        assert_choice(align_character, c("c", "l", "r"))
+      }
+      if (is.null(j)) {
+        msg <- "Please specify the `j` argument."
+        stop(msg, call. = FALSE)
+      }
+    }
+  }
+    
   nalign <- if (is.null(j)) meta(x, "ncols") else length(j)
   if (!is.null(align)) {
     align <- strsplit(align, split = "")[[1]]
diff --git a/inst/tinytest/_tinysnapshot/html-issue58.rds b/inst/tinytest/_tinysnapshot/html-issue58.rds
deleted file mode 100644
index 0cd373d8d1288a387bb19c768899720971129505..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1323
zcmV+`1=RW<iwFP!000001MQk^Pvb@qfPDo%Tt4+DY^_QOQewyCg#dASEu~Vct9mL_
zZ3XCVV{hWkZPuxG6F`XH*nd=Y)^<#wV4xi#D%}^dFEh{1tY;>>CcjlI%UZM6*Irp`
z8_={iemVNC(Sxziq4UaGw_aP8{b%LFhYy#2q^IJl(*NSypZ1S_e|JDke?TgI^GO7i
zW8Y@d9#jbFM~sH10nI7Xlmrn?6w|();_cNbNvF)W7o45V;zZjdh^1x{M9+ArBR^yd
z9<WB*sS_@_=2SFPKn3$Xr@2IFt_2%tE-y443f6bCfoxK6`H@5k8~Jvm^-S%$ZV*am
zqCzJ4B5@?suAEKXVH|6v6FPg-aazun8*-)HK&k5qXUe4mBQ{Bx@NK0p1XB@XdTB>G
zGN?GI6-0+lVN#vw=(<NPL0YqO-JpVx<t_=pXO`@dt53S0bnn$oW6aHiEDN|G;WJHC
z5?lxOEEX3dE`-BlchS1;n&6$NuSSgOdBT*>RM#E=E=Anr@zA$_q&oV6o;R`~n^1Kj
zgPSYenMPC4o6z$&Etjc|3yw6VQ_%=anE>H?R?Is2lEf#MX+PbE-J(OF06;P`BeqM9
zkE>r+>jeIs*2!`8<fLYLCnuZL)6-nxs-8F0V!VnOL6O;~LBw`Rbu8i`71gCi`gygt
z-0H%(zMB;_(;UX(MQ(k_7bFl=Dc?4gi-L7YUJOiGN}p#wpLXnYYl~-Xlk{Qc)oz#2
zxsLb9lqO>?8-k7Wt)YaEqve=QLaJ%wk2y_r+<;<bfQ?xa2TUmr<+!SoIjar|ulqW4
z0X~Te;u$kG3wW?5%%GiynW?}+&8YOZ28V1$1=P~$2|Dkfs6S1|8<0$XX=l+`nw<=8
z4W+)UvNKbiw@i+8bdy%D@vGVQ$0?+qJ!y$d;|WU~&RD>ix=R?wR<^-N6yLEo_N=e3
zqw~RCG{fPb<9NUe@0)Hpow8}qX_rkmovpHII2FW--Ys#{<wrQuc6Q1gY5s2<*)Dga
z)D+KYy&Oln<&Km_o>v}u&*?~~Ja$^;e!ig4>Xe((Do-J=JTRN(@aGM!Qd1s$BBd$x
zyrK1gBQGXL+U1sRJrr6mCPyCp9{F!ot5o~(jzDkqs~)=M0GOXk;qtmj53Bdw5gva5
zo~+(~hjSSUmfs{wkMg6r3^b1=DbBhzUMG_}f$Q^o9&Q$=@dZstc24$57zgty91oo_
z(+7f?<~JALhqaXh^XA_2W?;Hb5}&DKe(D5F2z5MxhB<7%1;ZU0hP8aLOy}yRVO%Pf
z=tDSy{v4kf<MIP(efbXJX*O018>@wlMo+Rc;DcgjaJFi?;%%{g@B!p9g<Q~#)tZH5
zF6BU!e64lDhjYzpc5b*`xbP2oF5zBs1b0f{=iV*%<c!M@mV@0oSirE^ItIeEs)%U_
zH>zU4YOo(GPjjnInsDD*@tRz1{%cwbmDWb3bx>(tRN6Kwt%pk6L8W<3T%3oCL#07(
zd8oOCNNc0gI;gZRDs3B;)<dQ3pwdikVd6Yo94ZZRYYR2E5NT~xS_hTZMWt<{(t4=0
z9aNghEliw;i$kRWs)d?ch_p5;t%FMIqSCfeX+2ch4l2#$7ADTa#i7z5x7w(=g-C0o
z(mJTLE-GysmDWS0?V!?3Zeij)T-=?s?A6!uHB|av+w2utrSGOcS24e2saV$fXV*V(
hu{P3IM$lOK&5QN=qvZNMRoqPc^*3Zxi9RSJ005oZj#K~u

diff --git a/inst/tinytest/_tinysnapshot/latex-align.txt b/inst/tinytest/_tinysnapshot/latex-align.txt
index 21ffd88f..ec6f1986 100644
--- a/inst/tinytest/_tinysnapshot/latex-align.txt
+++ b/inst/tinytest/_tinysnapshot/latex-align.txt
@@ -6,15 +6,10 @@
 {                     %% tabularray inner open
 colspec={Q[]Q[]Q[]Q[]Q[]},
 column{1}={halign=c,},
-cell{1}{1}={}{halign=c,},
 column{2}={halign=c,},
-cell{1}{2}={}{halign=c,},
 column{3}={halign=l,},
-cell{1}{3}={}{halign=l,},
 column{4}={halign=l,},
-cell{1}{4}={}{halign=l,},
 column{5}={halign=r,},
-cell{1}{5}={}{halign=r,},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
diff --git a/inst/tinytest/test-html.R b/inst/tinytest/test-html.R
index e294a8cf..f534ee64 100644
--- a/inst/tinytest/test-html.R
+++ b/inst/tinytest/test-html.R
@@ -28,7 +28,8 @@ tab <- tt(x, output = "html") |>
 expect_equal_to_reference(clean(tab), "_tinysnapshot/html-vectorized_color_j.rds")
 
 # Issue #58
-tab <- tt(iris[1:10,], output = "html", align = "ccccc") |> 
+tab <- tt(iris[1:10,], output = "html") |> 
+  style_tt(align = "c") |>
   group_tt(j = list("Sepal" = 1:2, "Petal" = 3:4))
 expect_equal_to_reference(clean(tab), "_tinysnapshot/html-issue58.rds")
 
diff --git a/inst/tinytest/test-latex.R b/inst/tinytest/test-latex.R
index 1e934dd4..edac0862 100644
--- a/inst/tinytest/test-latex.R
+++ b/inst/tinytest/test-latex.R
@@ -15,7 +15,7 @@ expect_snapshot_print(
 
 # Align
 expect_snapshot_print(
-  tt(x, output = "latex", align = "ccllr"),
+  tt(x, output = "latex") |> style_tt(j = 1:5, align = "ccllr"),
   label = "latex-align")
 
 # Themes