From ce44396e1d1bd525586c90d7a5fc45acb21b938c Mon Sep 17 00:00:00 2001
From: Vincent Arel-Bundock <vincent.arel-bundock@umontreal.ca>
Date: Fri, 25 Oct 2024 20:50:17 -0400
Subject: [PATCH] typst lines close

---
 R/style_typst.R | 44 +++++---------------------------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/R/style_typst.R b/R/style_typst.R
index d98f58cf..8372fe20 100644
--- a/R/style_typst.R
+++ b/R/style_typst.R
@@ -169,16 +169,18 @@ style_apply_typst <- function(x) {
         return(out)
     }
 
-    if (sum(!is.na(sty$line)) > 0) {
-        lin <- sty[grepl("l|r", sty$line),, drop = FALSE]
+    lin <- sty[grepl("b|t", sty$line),, drop = FALSE]
+    if (nrow(lin) > 0) {
         lin <- split(lin, list(lin$i, lin$line, lin$line_color, lin$line_width))
         lin <- Filter(function(x) nrow(x) > 0, lin)
         lin <- lapply(lin, hlines)
         for (l in lin) {
             x@table_string <- lines_insert(x@table_string, l, "tinytable lines before", "before")
         }
+    }
 
-        lin <- sty[grepl("l|r", sty$line),, drop = FALSE]
+    lin <- sty[grepl("l|r", sty$line),, drop = FALSE]
+    if (nrow(lin) > 0) {
         lin <- split(lin, list(lin$j, lin$line, lin$line_color, lin$line_width))
         lin <- Filter(function(x) nrow(x) > 0, lin)
         lin <- lapply(lin, vlines)
@@ -187,42 +189,6 @@ style_apply_typst <- function(x) {
         }
     }
 
-    #
-    # # Lines are not part of cellspec/rowspec/columnspec. Do this separately.
-    # lin$i <- lin$i + x@nhead
-    # # not sure why, but seems necessary
-    # if (x@nhead == 0) lin$i <- lin$i + 1
-    #
-    # lin_split <- split(lin, lin[, 3:ncol(lin)])
-    # for (ls in lin_split) {
-    #     line_h <- "table.hline(y: %s, start: %s, end: %s, stroke: %sem + %s),"
-    #     line_v <- "table.vline(x: %s, start: %s, end: %s, stroke: %sem + %s),"
-    #     if (any(grepl("b", ls$line))) {
-    #         for (h in unique(ls$i)) {
-    #             template <- sprintf(line_h, h, min(ls$j) - 1, max(ls$j), ls$line_width[1], ls$line_color[1])
-    #             x@table_string <- lines_insert(x@table_string, template, "tinytable lines before", "before")
-    #         }
-    #     }
-    #     if (any(grepl("t", ls$line))) {
-    #         for (h in unique(ls$i)) {
-    #             template <- sprintf(line_h, h - 1, min(ls$j) - 1, max(ls$j), ls$line_width[1], ls$line_color[1])
-    #             x@table_string <- lines_insert(x@table_string, template, "tinytable lines before", "before")
-    #         }
-    #     }
-    #     if (any(grepl("l", ls$line))) {
-    #         for (v in unique(ls$j)) {
-    #             template <- sprintf(line_v, v - 1, min(ls$i) - 1, max(ls$i), ls$line_width[1], ls$line_color[1])
-    #             x@table_string <- lines_insert(x@table_string, template, "tinytable lines before", "before")
-    #         }
-    #     }
-    #     if (any(grepl("r", ls$line))) {
-    #         for (v in unique(ls$j)) {
-    #             template <- sprintf(line_v, v, min(ls$i) - 1, max(ls$i), ls$line_width[1], ls$line_color[1])
-    #             x@table_string <- lines_insert(x@table_string, template, "tinytable lines before", "before")
-    #         }
-    #     }
-    # }
-    #
     return(x)
 }