From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: error in calculating percentages in clocktables Date: Fri, 3 Dec 2010 09:52:57 +0100 Message-ID: <3F1F7C35-B348-4A8A-9F1E-91E7D78B5092@gmail.com> References: <20101129.115616.179398633.joost@snow.nl> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=60965 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PORO3-0008Es-5A for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:53:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PORO1-0006Qu-VE for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:53:03 -0500 Received: from mail-ew0-f43.google.com ([209.85.215.43]:40274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PORO1-0006Qk-PO for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:53:01 -0500 Received: by ewy22 with SMTP id 22so6576415ewy.30 for ; Fri, 03 Dec 2010 00:53:00 -0800 (PST) In-Reply-To: <20101129.115616.179398633.joost@snow.nl> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Joost Helberg Cc: emacs-orgmode@gnu.org Hi Joost, thanks for this, but the new tables are complex and the patch was not general enough. I have just pushed a fix which I think is correct. Please verify. - Carsten On Nov 29, 2010, at 11:56 AM, Joost Helberg wrote: > ls, > > I'm using clocktables and encountered an issue in calculating the > percentage in the last column. Some columns have moved 1 left in the > head-revision, but the generated formula was not changed. > Hence the following patch. The percentages come out OK with this > patch. > > Can someone using clocktables verify that this patch is correct and > doesn't break other stuff? > > diff --git a/lisp/org-clock.el b/lisp/org-clock.el > index eb859df..0c7c73b 100644 > --- a/lisp/org-clock.el > +++ b/lisp/org-clock.el > @@ -2173,9 +2173,9 @@ from the dynamic block defintion." > (format > "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f" > pcol > - (+ 2 (if narrow 1 0)) > - (+ 3 (if multifile 1 0)) > - (+ (if multifile 1 0) 3) > + (+ 1 (if narrow 1 0)) > + (+ 2 (if multifile 1 0)) > + (+ (if multifile 1 0) 2) > (1- pcol))) > (setq recalc t)) > ((stringp formula) > > regards, > > Joost Helberg > > -- > Snow B.V. http://snow.nl > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten