Re: [O] [patch] Re: meaning of body-only in org-export-as-html
Bastien writes: >> By the way, I am in the "Processing" section in the list of people who >> have signed papers on Worg. However, I received confirmation that my >> papers went through a long time ago. Should I correct Worg on this? > > Let me know when this is done. I did this yesterday. It turned out that I was listed in two places: once with my full name and once with the short name that I go by. I just removed my short name from the list. Cheers, Chris
Re: [O] [patch] Re: meaning of body-only in org-export-as-html
Hi Chris, Chris Gray writes: > Bastien writes: >> I'm ready to apply this patch, but can you add a proper Emacs >> ChangeLog? > > Updated patch attached. Applied, thanks for the effort in formatting/documenting it. > By the way, I am in the "Processing" section in the list of people who > have signed papers on Worg. However, I received confirmation that my > papers went through a long time ago. Should I correct Worg on this? Let me know when this is done. Best, -- Bastien
Re: [O] [patch] Re: meaning of body-only in org-export-as-html
Chris Gray writes: > Bastien writes: >> I'm ready to apply this patch, but can you add a proper Emacs >> ChangeLog? > > Updated patch attached. Thanks, I will review it. > By the way, I am in the "Processing" section in the list of people who > have signed papers on Worg. However, I received confirmation that my > papers went through a long time ago. Should I correct Worg on this? Yes, please go ahead! Thanks, -- Bastien
Re: [O] [patch] Re: meaning of body-only in org-export-as-html
Bastien writes: > I'm ready to apply this patch, but can you add a proper Emacs > ChangeLog? Updated patch attached. By the way, I am in the "Processing" section in the list of people who have signed papers on Worg. However, I received confirmation that my papers went through a long time ago. Should I correct Worg on this? Cheers, Chris >From 3ae7de6bd5b91ce18ed38dfce46466d6dd3a64b7 Mon Sep 17 00:00:00 2001 From: Chris Gray Date: Tue, 3 Apr 2012 10:32:56 -0600 Subject: [PATCH] Export: Allow for TOC generation if body-only is set * lisp/org-html.el (org-export-as-html): Remove the check for body-only in the code for generating tables of contents. The docstring for org-export-as-html states that the body-only flag removes everything outside the tags (inclusive). Since the table of contents is inside these tags, it should be exported when requested even if the body-only flag is set. --- lisp/org-html.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index be2124b..385d8ec 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1414,7 +1414,7 @@ PUB-DIR is set, use this as the publishing directory." "\n" title "\n")) ;; insert body - (if (and org-export-with-toc (not body-only)) + (if org-export-with-toc (progn (push (format "%s\n" org-export-html-toplevel-hlevel -- 1.7.9
Re: [O] [patch] Re: meaning of body-only in org-export-as-html
Hi Chris, Chris Gray writes: >> I see one problem in that it would be then be inconsistent with >> org-export-as-ascii which considers the TOC to be part of the header. I >> would like to be able to export just the TOC (as ascii, and I understand >> a new ascii exporter has been written lately). The same thing for the >> html exporter would presumably solve your problem too because then you >> could export TOC+body (as html)? > > The thing is, the docstring is not consistent with the code. It would > make my life easier if the code was changed to match the docstring, but > I would also be okay if the opposite happened. > > I am also looking forward to the new exporter being ready, but I guess > this small issue should be fixed in the current exporter until it is. > > I have attached the patch that I suggested for the HTML exporter. I'm ready to apply this patch, but can you add a proper Emacs ChangeLog? Thanks, -- Bastien
[O] [patch] Re: meaning of body-only in org-export-as-html
Hi Myles, Sorry I missed your email for so long. On Thu, 22 Mar 2012 14:51:29 +, Myles English wrote: > > Hi Chris, > > >> On Fri, 16 Mar 2012 16:33:22 -0600, Chris Gray said: > > > Hello, I am using org-export-as-html with the body-only parameter > > set to t in the org plugin for ikiwiki that I'm working on. It > > works almost perfectly, but I recently had a user point out that > > it's not possible to get a table of contents, even when one is > > explicitly asked for in the #+OPTIONS line of the org file. > > > Since the table of contents is part of the body (at least in the > > sense that it is between the tags), I found this surprising. > > So would it cause problems to change the line > > > (if (and org-export-with-toc (not body-only)) ...) > > > to > > > (if org-export-with-toc ...) > > > in org-export-as-html? > > I see one problem in that it would be then be inconsistent with > org-export-as-ascii which considers the TOC to be part of the header. I > would like to be able to export just the TOC (as ascii, and I understand > a new ascii exporter has been written lately). The same thing for the > html exporter would presumably solve your problem too because then you > could export TOC+body (as html)? The thing is, the docstring is not consistent with the code. It would make my life easier if the code was changed to match the docstring, but I would also be okay if the opposite happened. I am also looking forward to the new exporter being ready, but I guess this small issue should be fixed in the current exporter until it is. I have attached the patch that I suggested for the HTML exporter. Cheers, Chris >From 9f91361e8c8cd7047acf0260bff2ae81e72fcc93 Mon Sep 17 00:00:00 2001 From: Chris Gray Date: Sat, 31 Mar 2012 16:35:04 -0600 Subject: [PATCH] Bring the meaning of body-only in org-export-as-html closer to docs The docstring for org-export-as-html says "When BODY-ONLY is set, don't produce the file header and footer, simply return the content of ..., without even the body tags themselves." However, it currently also inhibits the generation of the table of contents, regardless if one is asked for by the user in the #+OPTIONS line of the file. This patch fixes that (i.e. allows for toc generation if it is requested). --- lisp/org-html.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 2de2ea9..cb785f3 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1402,7 +1402,7 @@ PUB-DIR is set, use this as the publishing directory." "\n" title "\n")) ;; insert body - (if (and org-export-with-toc (not body-only)) + (if org-export-with-toc (progn (push (format "%s\n" org-export-html-toplevel-hlevel -- 1.7.9
