emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] Adding new table rows/cols in a formula update


From: Dima Kogan
Subject: Re: [O] Adding new table rows/cols in a formula update
Date: Fri, 03 Oct 2014 11:07:07 -0700

Nick Dokos <address@hidden> writes:

> Nicolas Goaziou <address@hidden> writes:
>
> Does it need sanity checking? A typo in a formula can create "billions
> and billions"[fn:1] of columns inadvertently.

Sure. Updated patch attached.

>From 06f09e58a0f8b62429dda2faa913e297218b67b2 Mon Sep 17 00:00:00 2001
From: Dima Kogan <address@hidden>
Date: Tue, 30 Sep 2014 22:36:21 -0700
Subject: [PATCH] org-table.el: field formulas can now create columns as needed

(org-table-recalculate): use the new org-table-formula-make-new-cols
customization to control whether org creates new columns when a
formula explicitly targets them

TINYCHANGE
---
 lisp/org-table.el | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 7607ead..14c68d6 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -354,6 +354,18 @@ portability of tables."
          (const :tag "Stick to hline" nil)
          (const :tag "Error on attempt to cross" error)))
 
+(defcustom org-table-formula-create-columns nil
+  "Non-nil means that evaluation of a field formula can add new
+columns if an out-of-bounds field is being set."
+  :group 'org-table-calculation
+  :version "24.5"
+  :package-version '(Org . "8.3")
+  :type '(choice
+         (const :tag "Setting an out-of-bounds field generates an error 
(default)" nil)
+         (const :tag "Setting an out-of-bounds field silently adds columns as 
needed" t)
+         (const :tag "Setting an out-of-bounds field adds columns as needed, 
but issues a warning message" warn)
+         (const :tag "When setting an out-of-bounds field, the user is 
prompted" prompt)))
+
 (defgroup org-table-import-export nil
   "Options concerning table import and export in Org-mode."
   :tag "Org Table Import Export"
@@ -3125,9 +3137,26 @@ known that the table will be realigned a little later 
anyway."
       (while (setq eq (pop eqlname1))
        (message "Re-applying formula to field: %s" (car eq))
        (org-goto-line (nth 1 eq))
-       (org-table-goto-column (nth 2 eq))
-       (org-table-eval-formula nil (nth 3 eq) 'noalign 'nocst
-                               'nostore 'noanalysis))
+       (let ((column-target (nth 2 eq)))
+         (when (> column-target 1000)
+           (user-error "Formula column target too large"))
+         (let* ((column-count (progn (end-of-line)
+                                     (1- (org-table-current-column))))
+                (create-new-column
+                 (and (> column-target column-count)
+                      (or (eq org-table-formula-create-columns t)
+                          (and
+                           (eq org-table-formula-create-columns 'warn)
+                           (progn
+                             (org-display-warning "Out-of-bounds formula added 
columns")
+                             t))
+                          (and
+                           (eq org-table-formula-create-columns 'prompt)
+                           (yes-or-no-p "Out-of-bounds formula. Add 
columns?"))))))
+           (org-table-goto-column column-target nil create-new-column))
+
+         (org-table-eval-formula nil (nth 3 eq) 'noalign 'nocst
+                                 'nostore 'noanalysis)))
 
       (org-goto-line thisline)
       (org-table-goto-column thiscol)
-- 
2.0.0


reply via email to

[Prev in Thread] Current Thread [Next in Thread]