Better sitemap formating

Better sitemap formating

[Manuel Giraud]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]


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?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-publish.el-sitemap-formating-coherent-with-new-p.patch --]
[-- Type: text/x-patch, Size: 2144 bytes --]

From 766b0db7d0189d2edb0d8799c3424d62f9ac4e47 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
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


[-- Attachment #3: Type: text/plain, Size: 19 bytes --]


-- 
Manuel Giraud

[-- Attachment #4: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

[Accepted] Better sitemap formating

[Bastien Guerry]

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 <manuel.giraud@univ-nantes.fr>
> X-Patchwork-Id: 594
> Message-Id: <87lj1m7hts.fsf@univ-nantes.fr>
> To: emacs-orgmode <emacs-orgmode@gnu.org>
> 
> 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 <manuel.giraud@univ-nantes.fr>
> 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
> 
> 

Re: Better sitemap formating

[Bastien]

Hi Manuel,

Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:

> Here's a patch that make the sitemap entry formating coherent with the
> new html-pre/postamble one. 

Applied, thanks.

> 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?

I guess it's acceptable -- please provide a patch.

Thanks!

-- 
 Bastien