From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hendy Subject: Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export Date: Thu, 12 Aug 2010 08:56:44 -0500 Message-ID: References: <87bp9a8a8b.wl%n.goaziou@gmail.com> <20100811075021.27EB91ACCA4F@carsten-dominiks-macbook-pro.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1813104446==" Return-path: Received: from [140.186.70.92] (port=36807 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjYH6-0003xq-9Z for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 09:56:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjYH0-0007T7-7Z for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 09:56:52 -0400 Received: from mail-vw0-f41.google.com ([209.85.212.41]:59383) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjYH0-0007Sp-47 for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 09:56:46 -0400 Received: by vws16 with SMTP id 16so791789vws.0 for ; Thu, 12 Aug 2010 06:56:44 -0700 (PDT) In-Reply-To: <20100811075021.27EB91ACCA4F@carsten-dominiks-macbook-pro.local> 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: Carsten Dominik Cc: emacs-orgmode@gnu.org --===============1813104446== Content-Type: multipart/alternative; boundary=0016e6441efe8c2179048da0bc93 --0016e6441efe8c2179048da0bc93 Content-Type: text/plain; charset=ISO-8859-1 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 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 > > X-Patchwork-Id: 211 > > Message-Id: <87bp9a8a8b.wl%n.goaziou@gmail.com<87bp9a8a8b.wl%25n.goaziou@gmail.com> > > > > To: John Hendy > > Cc: emacs-orgmode > > > > 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 > > 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 > --0016e6441efe8c2179048da0bc93 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Now that the patch is "official", how do I conduct my next git pu= ll since I don't really want to commit my modified file in favor of the= incoming from the git server?

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


John

O= n 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=3D"utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode] Re: [PATCH] Table caption produces trailing &= quot;nil" in pdf
> =A0 =A0 =A0 export
> Date: Wed, 11 Aug 2010 01:48:52 -0000
> From: Nicolas Goaziou <n.goa= ziou@gmail.com>
> X-Patchwork-Id: 211
> Message-Id: <87bp9a8a8b.wl%n.goaziou@gmail.com>
> To: John Hendy <jw.hendy@gmai= l.com>
> Cc: emacs-orgmode <emacs-o= rgmode@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 co= mputer and
> > tested an old file to make sure the export was working. I then ch= ecked 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.goa= ziou@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
> =A0 when no label is attached.
>
> ---
> lisp/org-latex.el | =A0 =A02 +-
> =A01 files changed, 1 insertions(+), 1 deletions(-)<= br> >
> 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-BEFOR= E and STRING-AFTER."
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "\\ca= ption%s{%s} %s"
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (if shortn= (concat "[" shortn "]") "")
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (or captio= n "")
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(when label (form= at "\\label{%s}" label))))
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(if label (format= "\\label{%s}" label) "")))
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(if (and longtblp c= aption) "\\\\\n" "\n")
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(if (and org-export= -latex-tables-centered (not longtblp))
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"\\beg= in{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

--0016e6441efe8c2179048da0bc93-- --===============1813104446== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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 --===============1813104446==--