From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Guerry Subject: [Accepted] Better sitemap formating Date: Fri, 11 Feb 2011 17:37:00 +0100 (CET) Message-ID: <20110211163700.A4E427F77@myhost.localdomain> References: <87lj1m7hts.fsf@univ-nantes.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=48640 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnvzN-0007Fx-Fi for emacs-orgmode@gnu.org; Fri, 11 Feb 2011 11:36:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PnvzM-0005TM-6U for emacs-orgmode@gnu.org; Fri, 11 Feb 2011 11:36:57 -0500 Received: from mail-fx0-f41.google.com ([209.85.161.41]:44355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PnvzL-0005TH-Ut for emacs-orgmode@gnu.org; Fri, 11 Feb 2011 11:36:56 -0500 Received: by fxm12 with SMTP id 12so3050563fxm.0 for ; Fri, 11 Feb 2011 08:36:55 -0800 (PST) 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: emacs-orgmode@gnu.org Patch 594 (http://patchwork.newartisans.com/patch/594/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87lj1m7hts.fsf%40univ-nantes.fr%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] Better sitemap formating > Date: Fri, 11 Feb 2011 19:43:11 -0000 > From: Manuel Giraud > X-Patchwork-Id: 594 > Message-Id: <87lj1m7hts.fsf@univ-nantes.fr> > To: emacs-orgmode > > Hi, > > Here's a patch that make the sitemap entry formating coherent with the > new html-pre/postamble one. > > While here I was trying to add some documentation about this feature in > org.texi but I end up copy/pasting or paraphrasing the docstring of > correspondant customs. Is it acceptable for the documentation or plain > useless? > > > >From 766b0db7d0189d2edb0d8799c3424d62f9ac4e47 Mon Sep 17 00:00:00 2001 > From: Manuel Giraud > Date: Fri, 11 Feb 2011 15:32:58 +0100 > Subject: [PATCH] org-publish.el: sitemap formating coherent with new preamble > > Adopt downcase for format directive to be coherent with the new > pre/postamble formating. > > Use `format-spec' function instead of `org-replace-escapes'. > --- > lisp/org-publish.el | 21 ++++++++++----------- > 1 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/lisp/org-publish.el b/lisp/org-publish.el > index a7aaee2..3a29d06 100644 > --- a/lisp/org-publish.el > +++ b/lisp/org-publish.el > @@ -55,6 +55,7 @@ > (require 'cl)) > (require 'org) > (require 'org-exp) > +(require 'format-spec) > > (eval-and-compile > (unless (fboundp 'declare-function) > @@ -271,13 +272,13 @@ in the sitemap." > :group 'org-publish > :type 'string) > > -(defcustom org-publish-sitemap-file-entry-format "%T" > +(defcustom org-publish-sitemap-file-entry-format "%t" > "How a sitemap file entry is formated. > You could use brackets to delimit on what part the link will be. > > -%T is the title. > -%A is the author. > -%D is the date formated using `org-publish-sitemap-date-format'." > +%t is the title. > +%a is the author. > +%d is the date formated using `org-publish-sitemap-date-format'." > :group 'org-publish > :type 'string) > > @@ -816,13 +817,11 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." > (or visiting (kill-buffer sitemap-buffer)))) > > (defun org-publish-format-file-entry (fmt file project-plist) > - (org-replace-escapes fmt > - (list (cons "%T" (org-publish-find-title file)) > - (cons "%D" (format-time-string > - sitemap-date-format > - (org-publish-find-date file))) > - (cons "%A" (or (plist-get project-plist :author) > - user-full-name))))) > + (format-spec fmt > + `((?t . ,(org-publish-find-title file)) > + (?d . ,(format-time-string sitemap-date-format > + (org-publish-find-date file))) > + (?a . ,(or (plist-get project-plist :author) user-full-name))))) > > (defun org-publish-find-title (file) > "Find the title of FILE in project." > -- > 1.7.1 > >