From 17cf0b2f71b91373217a606d9a6196ae6db698f8 Mon Sep 17 00:00:00 2001
From: Duncan Murdoch <murdoch.duncan@gmail.com>
Date: Wed, 22 Jan 2025 06:30:33 -0500
Subject: [PATCH] Missing use of withTableFns.

---
 DESCRIPTION  | 2 +-
 NEWS.md      | 4 ++++
 R/tabular.R  | 2 +-
 tables.Rproj | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index aabaa02..cddade8 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tables
 Title: Formula-Driven Table Generation
-Version: 0.9.31
+Version: 0.9.32
 Authors@R: person(given = "Duncan",
                   family = "Murdoch",
                   role = c("aut", "cre"),
diff --git a/NEWS.md b/NEWS.md
index 2b4f0a3..117dfc5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# tables 0.9.32
+
+- The fix for issue #30 was incomplete for some reason.
+
 # tables 0.9.31
 
 - In a few places `len` was used instead of `length.out` in calls to
diff --git a/R/tabular.R b/R/tabular.R
index a42a6e2..31ed4bf 100644
--- a/R/tabular.R
+++ b/R/tabular.R
@@ -643,7 +643,7 @@ tabular.formula <- function(table, data=NULL, n, suppressLabels=0, ...) {
     if (is.null(data) || is.environment(data))
     	data <- withTableFns
     else if (is.list(data))
-    	data <- list2env(data, parent = environment(table))
+    	data <- list2env(data, parent = withTableFns)
     else if (!is.environment(data))
     	stop("'data' must be a dataframe, list or environment")
     	
diff --git a/tables.Rproj b/tables.Rproj
index 982c68b..81b6f0c 100644
--- a/tables.Rproj
+++ b/tables.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: ff106abd-954f-4630-ab81-b1ea0de6fa9b
 
 RestoreWorkspace: Default
 SaveWorkspace: Default