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