From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: Release 6.13 Date: Tue, 25 Nov 2008 05:36:35 +0100 Message-ID: <56464B2D-DDAD-4FCD-B895-A398880ABC12@uva.nl> References: <87od06gv1u.fsf@gollum.intra.norang.ca> <8763mch9pu.fsf@kassiopeya.MSHEIMNETZ> <871vx0h8xz.fsf@kassiopeya.MSHEIMNETZ> Mime-Version: 1.0 (Apple Message framework v929.2) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4pfa-0004Sp-OL for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 23:37:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4pfX-0004SX-Oj for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 23:37:01 -0500 Received: from [199.232.76.173] (port=50993 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4pfX-0004SU-LQ for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 23:36:59 -0500 Received: from paard.ic.uva.nl ([145.18.40.182]:54348) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4pfW-00065b-Uq for emacs-orgmode@gnu.org; Mon, 24 Nov 2008 23:36:59 -0500 In-Reply-To: <871vx0h8xz.fsf@kassiopeya.MSHEIMNETZ> 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: Sebastian Rose Cc: emacs-orgmode Org-Mode Hi Sebastian, it seems to me thatt his patch depends on the projects in org-publish-projects-alist to be defined in a certain order, with the components first, and the big "parent" projects later. So maybe you need to iterate the dolist loop until it stabilizes. Also, I guess a "component" could be part of several "parents"? Hmm, maybe not a likely setup. OK, les not worry about this issue. - Carsten On Nov 25, 2008, at 2:48 AM, Sebastian Rose wrote: > Arrgh.... > > Sorry - there was an unnecessary line. > > > diff --git a/lisp/org-publish.el b/lisp/org-publish.el > index eafa8fa..3ec48c4 100644 > --- a/lisp/org-publish.el > +++ b/lisp/org-publish.el > @@ -470,7 +470,11 @@ matching filenames." > (defun org-publish-get-project-from-filename (filename) > "Return the project FILENAME belongs." > (let* ((project-name (cdr (assoc (expand-file-name filename) > org-publish-files-alist)))) > + (dolist (prj org-publish-project-alist) > + (if (member project-name (plist-get (cdr prj) :components)) > + (setq project-name (car prj)))) > (assoc project-name org-publish-project-alist))) > > ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; > > > > Regards, > > Sebastian > > > Sebastian Rose writes: >> OK, here is the patch. This ensures, that the whole project is >> published >> for >> >> C-c C-e P >> >> Hence ditaa blocks can be exported together with a changed Org-file >> again. >> >> >> >> diff --git a/lisp/org-publish.el b/lisp/org-publish.el >> index eafa8fa..3ec48c4 100644 >> --- a/lisp/org-publish.el >> +++ b/lisp/org-publish.el >> @@ -470,7 +470,11 @@ matching filenames." >> (defun org-publish-get-project-from-filename (filename) >> "Return the project FILENAME belongs." >> (let* ((project-name (cdr (assoc (expand-file-name filename) >> - org-publish-files-alist)))) >> + org-publish-files-alist))) >> + (parent-project nil)) >> + (dolist (prj org-publish-project-alist) >> + (if (member project-name (plist-get (cdr prj) :components)) >> + (setq project-name (car prj)))) >> (assoc project-name org-publish-project-alist))) >> >> ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >> >> >> >> Regards, >> >> >> Sebastian >> >> >> >> >> >> >> >> >> >> Bernt Hansen writes: >>> Carsten Dominik writes: >>> >>>> New contributed file /org-exp-blocks.el/ >>>> ---------------------------------------- >>>> >>>> This new file implements special export behavior of >>>> user-defined blocks. The currently supported blocks are >>>> >>>> - comment :: Comment blocks with author-specific markup >>>> - ditaa :: conversion of ASCII art into pretty png files >>>> using Stathis Sideris' /ditaa.jar/ program >>>> - dot :: creation of graphs in the /dot/ language >>>> - R :: Sweave type exporting using the R program >>>> >>>> For more details and examples, see the file commentary in >>>> /org-exp-blocks.el/. >>>> >>>> Kudos to Eric Schulte for this new functionality, after >>>> /org-plot.el/ already his second major contribution. Thanks >>>> to Stathis for this excellent program, and for allowing us to >>>> bundle it with Org-mode. >>> >>> Thanks for this! I really like that C-c ' now makes editing the >>> ditaa >>> images easy. >>> >>> Now for my questions related to improving my work-flow for >>> generating >>> documents with ditaa images. >>> >>> Q1: Can org-publish-current-project somehow automatically pick up >>> ditaa >>> generated images? >>> >>> I have a play org file http://doc.norang.ca/org-mode.org which >>> generates the page at http://doc.norang.ca/org-mode.html. >>> >>> I usually edit the source file and then >>> M-x org-publish-current-project >>> to publish my changes. >>> >>> This was working great... until ditaa came along :). >>> >>> Now exporting my .org files creates new ditaa generated images >>> (.png >>> files) which don't get exported with the document because they >>> are >>> part of a different project. After org-publish-current-project I >>> have to remember to also org-publish doc-png to get the ditaa >>> generated images published. >>> >>> Publishing the parent project 'doc' instead >>> >>> doc >>> doc-org (org -> HTML export -> publishing target) >>> doc-png (copy .png -> publishing target) >>> >>> works fine so maybe I just need fix my workflow so my publish >>> code >>> is smart enough to find the appropriate parent project and >>> publish >>> that instead. >>> >>> Q2: Can org-publish handle a source file in more than one project? >>> >>> Sometimes I would like to publish the generated page (org- >>> mode.html) >>> as well as the source file that creates it (org-mode.org) as in >>> Q1 >>> above. I don't think I can have a doc-org project that generates >>> HTML and a doc-src project that just copies the .org files >>> verbatim >>> to the target directory since after publishing one of the two >>> projects the file is 'unchanged' and skipped for publishing the >>> second one. Is there a way to accomplish this? >>> >>> For now I'm manually touching the org file and manually >>> publishing >>> the doc-src project to make it work. >>> >>> >>> ditaa images look great on HTML exports. I'm having some difficulty >>> including them in other formats (PDF for instance - they end up >>> being >>> tiny.) Someday I'll find a good solution for that. >>> http://doc.norang.ca/org-mode.pdf is an example. >>> >>> Thanks for org-mode! >>> >>> Regards, >>> Bernt >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Remember: use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >>> > > -- > Sebastian Rose, EMMA STIL - mediendesign, Niemeyerstr.6, 30449 > Hannover > > Tel.: +49 (0)511 - 36 58 472 > Fax: +49 (0)1805 - 233633 - 11044 > mobil: +49 (0)173 - 83 93 417 > Email: s.rose emma-stil de, sebastian_rose gmx de > Http: www.emma-stil.de > > > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode