emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* Table caption produces trailing "nil" in pdf export
@ 2010-08-10 19:36 John Hendy
  2010-08-10 20:48 ` [PATCH] " Nicolas Goaziou
  2010-08-10 21:07 ` David Maus
  0 siblings, 2 replies; 8+ messages in thread
From: John Hendy @ 2010-08-10 19:36 UTC (permalink / raw)
  To: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 649 bytes --]

Hi,


Suddenly I'm getting a line with nothing but "nil" between the caption and
the table when exporting from org-mode to LaTeX. I swear this not happening.
I believe I did a git pull on Friday or some time last week. The only reason
I noticed is that I just set up emacs, org, and LaTeX on a new computer and
tested an old file to make sure the export was working. I then checked my
other computer with what I thought was a fine install and it's doing it now,
too. I originally thought I missed something on the new computer, but now
I'm wondering if it's from the fresh pull.

I tested three identical tables: 1 "vanilla", 1 with a #+ATTR_LATEX:

[-- Attachment #1.2: Type: text/html, Size: 750 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Table caption produces trailing "nil" in pdf export
  2010-08-10 19:36 Table caption produces trailing "nil" in pdf export John Hendy
@ 2010-08-10 20:48 ` Nicolas Goaziou
  2010-08-11  7:50   ` [Accepted] " Carsten Dominik
  2010-08-10 21:07 ` David Maus
  1 sibling, 1 reply; 8+ messages in thread
From: Nicolas Goaziou @ 2010-08-10 20:48 UTC (permalink / raw)
  To: John Hendy; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 713 bytes --]

Hello,

>>>>> John Hendy writes:

> Suddenly I'm getting a line with nothing but "nil" between the caption and
> the table when exporting from org-mode to LaTeX. I swear this not happening.
> I believe I did a git pull on Friday or some time last week. The only reason
> I noticed is that I just set up emacs, org, and LaTeX on a new computer and
> tested an old file to make sure the export was working. I then checked my
> other computer with what I thought was a fine install and it's doing it now,
> too. I originally thought I missed something on the new computer, but now
> I'm wondering if it's from the fresh pull.

This patch (needed by my own mistake) should correct the problem.

Regards,

-- Nicolas


[-- Attachment #2: 0001-Fix-empty-label-bug.patch --]
[-- Type: text/plain, Size: 1077 bytes --]

From 38a3ae8cf8716af0db87a47a421b6d5af654d045 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Tue, 10 Aug 2010 22:43:35 +0200
Subject: [PATCH] Fix empty label bug

* org-latex.el (org-export-latex-tables): Return "" instead of nil
  when no label is attached.
---
 lisp/org-latex.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 056f1b3..b0ba939 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1683,7 +1683,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                              "\\caption%s{%s} %s"
                              (if shortn (concat "[" shortn "]") "")
                              (or caption "")
-			     (when label (format "\\label{%s}" label))))
+			     (if label (format "\\label{%s}" label) "")))
                         (if (and longtblp caption) "\\\\\n" "\n")
                         (if (and org-export-latex-tables-centered (not longtblp))
                             "\\begin{center}\n")
-- 
1.7.2.1


[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Table caption produces trailing "nil" in pdf export
  2010-08-10 19:36 Table caption produces trailing "nil" in pdf export John Hendy
  2010-08-10 20:48 ` [PATCH] " Nicolas Goaziou
@ 2010-08-10 21:07 ` David Maus
  2010-08-10 21:14   ` John Hendy
  1 sibling, 1 reply; 8+ messages in thread
From: David Maus @ 2010-08-10 21:07 UTC (permalink / raw)
  To: John Hendy; +Cc: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 1074 bytes --]

John Hendy wrote:
>Hi,

>Suddenly I'm getting a line with nothing but "nil" between the
>caption and the table when exporting from org-mode to LaTeX.  I swear
>this not happening. I believe I did a git pull on Friday or some time
>last week. The only reason I noticed is that I just set up emacs,
>org, and LaTeX on a new computer and tested an old file to make sure
>the export was working. I then checked my other computer with what I
>thought was a fine install and it's doing it now, too. I originally
>thought I missed something on the new computer, but now I'm wondering
>if it's from the fresh pull.

>I tested three identical tables: 1 "vanilla", 1 with a #+ATTR_LATEX:

Could you provide an example Org file to reproduce this behavior?  It
might be also interesting to know the Emacs version (M-x emacs-version
RET) and Org mode version (M-x org-version RET) you use.  If you
execute these two commands, the version are available in the buffer
*Messages*.

Thanks,
  -- David
--
OpenPGP... 0x99ADB83B5A4478E6
Jabber.... dmjena@jabber.org
Email..... dmaus@ictsoc.de

[-- Attachment #1.2: Type: application/pgp-signature, Size: 230 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Table caption produces trailing "nil" in pdf export
  2010-08-10 21:07 ` David Maus
@ 2010-08-10 21:14   ` John Hendy
  0 siblings, 0 replies; 8+ messages in thread
From: John Hendy @ 2010-08-10 21:14 UTC (permalink / raw)
  To: David Maus; +Cc: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 1429 bytes --]

@David: Saw your other email, so you should be good to go with the files.
Sorry for the confusion!

@Nicolas: the patch worked. Hopefully I did it right:

$ cd .elisp/org.git/lisp
$ patch < ~/Downloads/0001..bug.patch


Thanks!
John

On Tue, Aug 10, 2010 at 4:07 PM, David Maus <dmaus@ictsoc.de> wrote:

> John Hendy wrote:
> >Hi,
>
> >Suddenly I'm getting a line with nothing but "nil" between the
> >caption and the table when exporting from org-mode to LaTeX.  I swear
> >this not happening. I believe I did a git pull on Friday or some time
> >last week. The only reason I noticed is that I just set up emacs,
> >org, and LaTeX on a new computer and tested an old file to make sure
> >the export was working. I then checked my other computer with what I
> >thought was a fine install and it's doing it now, too. I originally
> >thought I missed something on the new computer, but now I'm wondering
> >if it's from the fresh pull.
>
> >I tested three identical tables: 1 "vanilla", 1 with a #+ATTR_LATEX:
>
> Could you provide an example Org file to reproduce this behavior?  It
> might be also interesting to know the Emacs version (M-x emacs-version
> RET) and Org mode version (M-x org-version RET) you use.  If you
> execute these two commands, the version are available in the buffer
> *Messages*.
>
> Thanks,
>  -- David
> --
> OpenPGP... 0x99ADB83B5A4478E6
> Jabber.... dmjena@jabber.org
> Email..... dmaus@ictsoc.de
>

[-- Attachment #1.2: Type: text/html, Size: 2113 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export
  2010-08-10 20:48 ` [PATCH] " Nicolas Goaziou
@ 2010-08-11  7:50   ` Carsten Dominik
  2010-08-12 13:56     ` John Hendy
  0 siblings, 1 reply; 8+ messages in thread
From: Carsten Dominik @ 2010-08-11  7:50 UTC (permalink / raw)
  To: emacs-orgmode

Patch 211 (http://patchwork.newartisans.com/patch/211/) is now "Accepted".

Maintaner comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C87bp9a8a8b.wl%25n.goaziou%40gmail.com%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode] Re: [PATCH] Table caption produces trailing "nil" in pdf
> 	export
> Date: Wed, 11 Aug 2010 01:48:52 -0000
> From: Nicolas Goaziou <n.goaziou@gmail.com>
> X-Patchwork-Id: 211
> Message-Id: <87bp9a8a8b.wl%n.goaziou@gmail.com>
> To: John Hendy <jw.hendy@gmail.com>
> Cc: emacs-orgmode <emacs-orgmode@gnu.org>
> 
> Hello,
> 
> >>>>> John Hendy writes:
> 
> > Suddenly I'm getting a line with nothing but "nil" between the caption and
> > the table when exporting from org-mode to LaTeX. I swear this not happening.
> > I believe I did a git pull on Friday or some time last week. The only reason
> > I noticed is that I just set up emacs, org, and LaTeX on a new computer and
> > tested an old file to make sure the export was working. I then checked my
> > other computer with what I thought was a fine install and it's doing it now,
> > too. I originally thought I missed something on the new computer, but now
> > I'm wondering if it's from the fresh pull.
> 
> This patch (needed by my own mistake) should correct the problem.
> 
> Regards,
> 
> -- Nicolas
> >From 38a3ae8cf8716af0db87a47a421b6d5af654d045 Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <n.goaziou@gmail.com>
> Date: Tue, 10 Aug 2010 22:43:35 +0200
> Subject: [PATCH] Fix empty label bug
> 
> * org-latex.el (org-export-latex-tables): Return "" instead of nil
>   when no label is attached.
> 
> ---
> lisp/org-latex.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-latex.el b/lisp/org-latex.el
> index 056f1b3..b0ba939 100644
> --- a/lisp/org-latex.el
> +++ b/lisp/org-latex.el
> @@ -1683,7 +1683,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
>                               "\\caption%s{%s} %s"
>                               (if shortn (concat "[" shortn "]") "")
>                               (or caption "")
> -			     (when label (format "\\label{%s}" label))))
> +			     (if label (format "\\label{%s}" label) "")))
>                          (if (and longtblp caption) "\\\\\n" "\n")
>                          (if (and org-export-latex-tables-centered (not longtblp))
>                              "\\begin{center}\n")
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export
  2010-08-11  7:50   ` [Accepted] " Carsten Dominik
@ 2010-08-12 13:56     ` John Hendy
  2010-08-12 14:18       ` Bastien
  0 siblings, 1 reply; 8+ messages in thread
From: John Hendy @ 2010-08-12 13:56 UTC (permalink / raw)
  To: Carsten Dominik; +Cc: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 3395 bytes --]

Now that the patch is "official", how do I conduct my next git pull since I
don't really want to commit my modified file in favor of the incoming from
the git server?

Sorry... never really done this part before. I have had a hard enough time
trying to learn some git basics; merging is still elusive to me!


John

On Wed, Aug 11, 2010 at 2:50 AM, Carsten Dominik
<cdominik@newartisans.com>wrote:

> Patch 211 (http://patchwork.newartisans.com/patch/211/) is now "Accepted".
>
> Maintaner comment: No comment
>
> This relates to the following submission:
>
> http://mid.gmane.org/%3C87bp9a8a8b.wl%25n.goaziou%40gmail.com%3E
>
> Here is the original message containing the patch:
>
> > Content-Type: text/plain; charset="utf-8"
> > MIME-Version: 1.0
> > Content-Transfer-Encoding: 7bit
> > Subject: [Orgmode] Re: [PATCH] Table caption produces trailing "nil" in
> pdf
> >       export
> > Date: Wed, 11 Aug 2010 01:48:52 -0000
> > From: Nicolas Goaziou <n.goaziou@gmail.com>
> > X-Patchwork-Id: 211
> > Message-Id: <87bp9a8a8b.wl%n.goaziou@gmail.com<87bp9a8a8b.wl%25n.goaziou@gmail.com>
> >
> > To: John Hendy <jw.hendy@gmail.com>
> > Cc: emacs-orgmode <emacs-orgmode@gnu.org>
> >
> > Hello,
> >
> > >>>>> John Hendy writes:
> >
> > > Suddenly I'm getting a line with nothing but "nil" between the caption
> and
> > > the table when exporting from org-mode to LaTeX. I swear this not
> happening.
> > > I believe I did a git pull on Friday or some time last week. The only
> reason
> > > I noticed is that I just set up emacs, org, and LaTeX on a new computer
> and
> > > tested an old file to make sure the export was working. I then checked
> my
> > > other computer with what I thought was a fine install and it's doing it
> now,
> > > too. I originally thought I missed something on the new computer, but
> now
> > > I'm wondering if it's from the fresh pull.
> >
> > This patch (needed by my own mistake) should correct the problem.
> >
> > Regards,
> >
> > -- Nicolas
> > >From 38a3ae8cf8716af0db87a47a421b6d5af654d045 Mon Sep 17 00:00:00 2001
> > From: Nicolas Goaziou <n.goaziou@gmail.com>
> > Date: Tue, 10 Aug 2010 22:43:35 +0200
> > Subject: [PATCH] Fix empty label bug
> >
> > * org-latex.el (org-export-latex-tables): Return "" instead of nil
> >   when no label is attached.
> >
> > ---
> > lisp/org-latex.el |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/lisp/org-latex.el b/lisp/org-latex.el
> > index 056f1b3..b0ba939 100644
> > --- a/lisp/org-latex.el
> > +++ b/lisp/org-latex.el
> > @@ -1683,7 +1683,7 @@ The conversion is made depending of STRING-BEFORE
> and STRING-AFTER."
> >                               "\\caption%s{%s} %s"
> >                               (if shortn (concat "[" shortn "]") "")
> >                               (or caption "")
> > -                          (when label (format "\\label{%s}" label))))
> > +                          (if label (format "\\label{%s}" label) "")))
> >                          (if (and longtblp caption) "\\\\\n" "\n")
> >                          (if (and org-export-latex-tables-centered (not
> longtblp))
> >                              "\\begin{center}\n")
> >
>
> _______________________________________________
> 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
>

[-- Attachment #1.2: Type: text/html, Size: 4969 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export
  2010-08-12 13:56     ` John Hendy
@ 2010-08-12 14:18       ` Bastien
  2010-08-12 20:55         ` John Hendy
  0 siblings, 1 reply; 8+ messages in thread
From: Bastien @ 2010-08-12 14:18 UTC (permalink / raw)
  To: John Hendy; +Cc: Carsten Dominik, emacs-orgmode

John Hendy <jw.hendy@gmail.com> writes:

> Now that the patch is "official", how do I conduct my next git pull since I
> don't really want to commit my modified file in favor of the incoming from the
> git server?

If your patch comes from a temporary branch, just checkout the master
branch (~$ git checkout master) and pull normally with ~$ git pull.

(This is the advantage of working in branches: you'll always be able to
pull from the master branch.)

If your patch comes from the master branch, two cases:

1. you *didn't commit* your changes on your local repo.  Then you need
   to reset to HEAD and pull:

   ~$ git reset --hard HEAD
   ~$ git pull
   
2. you *did commit* your changes on your local repo.  Then you need to
   reset to a specific commit (i.e. the one from last pull) and pull:

   ~$ git reset --hard <commit>
   ~$ git pull

You can get <commit> with ~$ git log.

Playing with gitk might also help.

http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html
will give more details.

HTH,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export
  2010-08-12 14:18       ` Bastien
@ 2010-08-12 20:55         ` John Hendy
  0 siblings, 0 replies; 8+ messages in thread
From: John Hendy @ 2010-08-12 20:55 UTC (permalink / raw)
  To: Bastien; +Cc: Carsten Dominik, emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 1225 bytes --]

Worked like a charm. Thanks Bastien!

John

On Thu, Aug 12, 2010 at 9:18 AM, Bastien <bastien.guerry@wikimedia.fr>wrote:

> John Hendy <jw.hendy@gmail.com> writes:
>
> > Now that the patch is "official", how do I conduct my next git pull since
> I
> > don't really want to commit my modified file in favor of the incoming
> from the
> > git server?
>
> If your patch comes from a temporary branch, just checkout the master
> branch (~$ git checkout master) and pull normally with ~$ git pull.
>
> (This is the advantage of working in branches: you'll always be able to
> pull from the master branch.)
>
> If your patch comes from the master branch, two cases:
>
> 1. you *didn't commit* your changes on your local repo.  Then you need
>   to reset to HEAD and pull:
>
>   ~$ git reset --hard HEAD
>   ~$ git pull
>
> 2. you *did commit* your changes on your local repo.  Then you need to
>   reset to a specific commit (i.e. the one from last pull) and pull:
>
>   ~$ git reset --hard <commit>
>   ~$ git pull
>
> You can get <commit> with ~$ git log.
>
> Playing with gitk might also help.
>
> http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html
> will give more details.
>
> HTH,
>
> --
>  Bastien
>

[-- Attachment #1.2: Type: text/html, Size: 1860 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-08-12 20:55 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-10 19:36 Table caption produces trailing "nil" in pdf export John Hendy
2010-08-10 20:48 ` [PATCH] " Nicolas Goaziou
2010-08-11  7:50   ` [Accepted] " Carsten Dominik
2010-08-12 13:56     ` John Hendy
2010-08-12 14:18       ` Bastien
2010-08-12 20:55         ` John Hendy
2010-08-10 21:07 ` David Maus
2010-08-10 21:14   ` John Hendy

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).