[PATCH] Translate refs to rc also in remote references

[PATCH] Translate refs to rc also in remote references

[Jose E. Marchesi]

Hi all.

Just a tiny patch making org-table-convert-refs-to-rc to transform the
coordinates found in remote references into "normalised" @n$y.  This is
part of some work I am doing with remotes and which I will be sending to
the list soon: namely to update the remotes when the structure of
some referred table changes.

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 16f2520..f3cce91 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3229,7 +3229,7 @@ Parameters get priority."
 Works for single references, but also for entire formulas and even the
 full TBLFM line."
   (let ((start 0))
-    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^)]*)\\)" s start)
+    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^,]*[ \t]*\\|)\\)" s start)
       (cond
        ((match-end 3)
 	;; format match, just advance

-- 
Jose E. Marchesi         http://www.jemarch.net
GNU Project              http://www.gnu.org

Re: [PATCH] Translate refs to rc also in remote references

[Bastien]

Hi Jose,

jemarch@gnu.org (Jose E. Marchesi) writes:

> Just a tiny patch making org-table-convert-refs-to-rc to transform the
> coordinates found in remote references into "normalised" @n$y.  This is
> part of some work I am doing with remotes and which I will be sending to
> the list soon: namely to update the remotes when the structure of
> some referred table changes.

Looks good.  Can you provide the patch with a ChangeLog and with 
git format-patch ?

Thanks!

-- 
 Bastien

Re: [PATCH] Translate refs to rc also in remote references

[Jose E. Marchesi]

    
    > Just a tiny patch making org-table-convert-refs-to-rc to transform the
    > coordinates found in remote references into "normalised" @n$y.  This is
    > part of some work I am doing with remotes and which I will be sending to
    > the list soon: namely to update the remotes when the structure of
    > some referred table changes.
    
    Looks good.  Can you provide the patch with a ChangeLog and with 
    git format-patch ?
    
Sure.  Here is it.

From 37cc07cb5acd84c15216f0107936fe9367c53dca Mon Sep 17 00:00:00 2001
From: "Jose E. Marchesi" <jemarch@gnu.org>
Date: Wed, 11 Jul 2012 10:10:02 +0200
Subject: [PATCH] Transform the coordinates found in remote references into
 "normalised" @n$y.
To: emacs-orgmode@gnu.org

* org-table.el (org-table-convert-refs-to-rc): Convert references in
remote(..) directives.
---
 lisp/org-table.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 16f2520..f3cce91 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3229,7 +3229,7 @@ Parameters get priority."
 Works for single references, but also for entire formulas and even the
 full TBLFM line."
   (let ((start 0))
-    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^)]*)\\)" s start)
+    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^,]*[ \t]*\\|)\\)" s start)
       (cond
        ((match-end 3)
 	;; format match, just advance
-- 
1.7.10


-- 
Jose E. Marchesi         http://www.jemarch.net
GNU Project              http://www.gnu.org

Re: [PATCH] Translate refs to rc also in remote references

[Bastien]

Hi Jose,

jemarch@gnu.org (Jose E. Marchesi) writes:

> Sure.  Here is it.

Coming back to this.

> From 37cc07cb5acd84c15216f0107936fe9367c53dca Mon Sep 17 00:00:00 2001
> From: "Jose E. Marchesi" <jemarch@gnu.org>
> Date: Wed, 11 Jul 2012 10:10:02 +0200
> Subject: [PATCH] Transform the coordinates found in remote references into
>  "normalised" @n$y.
> To: emacs-orgmode@gnu.org
>
> * org-table.el (org-table-convert-refs-to-rc): Convert references in
> remote(..) directives.
> ---
>  lisp/org-table.el |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lisp/org-table.el b/lisp/org-table.el
> index 16f2520..f3cce91 100644
> --- a/lisp/org-table.el
> +++ b/lisp/org-table.el
> @@ -3229,7 +3229,7 @@ Parameters get priority."
>  Works for single references, but also for entire formulas and even the
>  full TBLFM line."
>    (let ((start 0))
> -    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^)]*)\\)" s start)
> +    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^,]*[ \t]*\\|)\\)" s start)

I fail to see the meaning of ([^,]*[ \t]*\\|) replacing ([^)]*)

The \\| is wrong, right?

I think I need an example with such a remote reference, the way
org-table-convert-refs-to-rc would have converted it, and the way
it does with your patch.

Thanks in advance!

-- 
 Bastien

Re: [PATCH] Translate refs to rc also in remote references

[Jose E. Marchesi]

Hi Bastien.
    

    > -    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^)]*)\\)" s start)
    > +    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^,]*[ \t]*\\|)\\)" s start)
    
    I fail to see the meaning of ([^,]*[ \t]*\\|) replacing ([^)]*)
    
    The \\| is wrong, right?

Yep, you can remove the \\|.
    
    I think I need an example with such a remote reference, the way
    org-table-convert-refs-to-rc would have converted it, and the way
    it does with your patch.

Real example from a formula in a table of mine:

  B3=(B2*remote(Factors,F10))/remote(Factors,G10)

The old org-table-convert-refs-to-rc would have converted it to:

"@3$2=(@2$2*remote(Factors,F10))/remote(Factors,G10)"
  
The new version to:

"@3$2=(@2$2*remote(Factors,@10$6))/remote(Factors,@10$7)"

i.e. the old version was not converting the A0 coordinates to rc
coordinates.

-- 
Jose E. Marchesi         http://www.jemarch.net
GNU Project              http://www.gnu.org

Re: [PATCH] Translate refs to rc also in remote references

[Bastien]

Hi Jose,

jemarch@gnu.org (Jose E. Marchesi) writes:

> i.e. the old version was not converting the A0 coordinates to rc
> coordinates.

thanks a lot for the detailed explanations.

I've just pushed a minimal fix for this:

diff --git a/lisp/org-table.el b/lisp/org-table.el
index d8aba8b..b6bc54a 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3236,7 +3236,7 @@ Parameters get priority."
 Works for single references, but also for entire formulas and even the
 full TBLFM line."
   (let ((start 0))
-    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^)]*)\\)" s start)
+    (while (string-match "\\<\\([a-zA-Z]+\\)\\([0-9]+\\>\\|&\\)\\|\\(;[^\r\n:]+\\|\\<remote([^,)]*)\\)" s start)
       (cond
        ((match-end 3)
 	;; format match, just advance

-- 
 Bastien

Re: [PATCH] Translate refs to rc also in remote references

[Jose E. Marchesi]

    
    > i.e. the old version was not converting the A0 coordinates to rc
    > coordinates.
    
    thanks a lot for the detailed explanations.
    I've just pushed a minimal fix for this:

Great, thanks :)
    
-- 
Jose E. Marchesi         http://www.jemarch.net
GNU Project              http://www.gnu.org