From: Nicolas Goaziou <n.goaziou@gmail.com>
To: Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: Some %elements in org-html-postamble-format became too "generous"
Date: Sun, 07 Apr 2013 21:00:27 +0200 [thread overview]
Message-ID: <87sj32w4hg.fsf@gmail.com> (raw)
In-Reply-To: <20130407185101.GA22894@BigDog.local> (Rick Frankel's message of "Sun, 7 Apr 2013 14:51:02 -0400")
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
Hello,
Rick Frankel <rick@rickster.com> writes:
> On Sun, Apr 07, 2013 at 08:32:34PM +0200, Nicolas Goaziou wrote:
>> Dieter Wilhelm <dieter@duenenhof-wilhelm.de> writes:
>> > Or just using a default time string format which is language
>> > independent, like %Y-%m-%d.
>>
>> There's `org-html--timestamp-format', which is used for all timestamps
>> in preamble, postamble and metadata. It's clearly an internal variable.
>> I don't know if it is used because the format is required or because it
>> saves copying over the same format string.
>>
>> Since I don't know the intent behind this, I can't tell if it could be
>> made a defcustom.
>
> It was created just localize the definition. I see no reason not to
> make it a defcustom.
Then what about this patch?
Regards,
--
Nicolas Goaziou
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ox-html-Add-defcustom-for-timestamps-in-metadata.patch --]
[-- Type: text/x-patch, Size: 3386 bytes --]
From 91283eedf89bd8b74b68f127737478a7a9b4d670 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sun, 7 Apr 2013 20:59:26 +0200
Subject: [PATCH] ox-html: Add defcustom for timestamps in metadata
* lisp/ox-html.el (org-html-metadata-timestamp-format): New variable,
renamed from `org-html--timestamp-format'.
(org-html--build-meta-info, org-html-format-spec,
org-html--build-pre/postamble): Use new variable.
---
lisp/ox-html.el | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index d09cc0f..3fe97dd 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -136,10 +136,6 @@
(defvar org-html-format-table-no-css)
(defvar htmlize-buffer-places) ; from htmlize.el
-(defvar org-html--timestamp-format "%Y-%m-%d %a %H:%M"
- "FORMAT used by `format-time-string' for timestamps in
-preamble, postamble and metadata.")
-
(defvar org-html--pre/postamble-class "status"
"CSS class used for pre/postamble")
@@ -912,6 +908,14 @@ org-info.js for your website."
(list :tag "Postamble" (const :format "" postamble)
(string :tag " id") (string :tag "element"))))
+(defcustom org-html-metadata-timestamp-format "%Y-%m-%d %a %H:%M"
+ "Format used for timestamps in preamble, postamble and metadata.
+See `format-time-string' for more information on its components."
+ :group 'org-export-html
+ :version "24.4"
+ :package-version '(Org . "8.0")
+ :type 'string)
+
;;;; Template :: Mathjax
(defcustom org-html-mathjax-options
@@ -1432,7 +1436,7 @@ INFO is a plist used as a communication channel."
(format
(when :time-stamp-file
(format-time-string
- (concat "<!-- " org-html--timestamp-format " -->\n"))))
+ (concat "<!-- " org-html-metadata-timestamp-format " -->\n"))))
(format
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"/>\n"
(or (and org-html-coding-system
@@ -1500,7 +1504,7 @@ INFO is a plist used as a communication channel."
used in the preamble or postamble."
`((?t . ,(org-export-data (plist-get info :title) info))
(?d . ,(org-export-data (org-export-get-date info) info))
- (?T . ,(format-time-string org-html--timestamp-format))
+ (?T . ,(format-time-string org-html-metadata-timestamp-format))
(?a . ,(org-export-data (plist-get info :author) info))
(?e . ,(mapconcat
(lambda (e)
@@ -1509,7 +1513,7 @@ used in the preamble or postamble."
", "))
(?c . ,(plist-get info :creator))
(?C . ,(let ((file (plist-get info :input-file)))
- (format-time-string org-html--timestamp-format
+ (format-time-string org-html-metadata-timestamp-format
(if file (nth 5 (file-attributes file))
(current-time)))))
(?v . ,(or org-html-validation-link ""))))
@@ -1552,10 +1556,9 @@ communication channel."
(format
"<p class=\"date\">%s: %s</p>\n"
(org-html--translate "Created" info)
- (format-time-string org-html--timestamp-format)))
+ (format-time-string org-html-metadata-timestamp-format)))
(when (plist-get info :with-creator)
- (format "<p class=\"creator\">%s</p>\n"
- creator))
+ (format "<p class=\"creator\">%s</p>\n" creator))
(format "<p class=\"xhtml-validation\">%s</p>\n"
validation-link))))
(t (format-spec
--
1.8.2
next prev parent reply other threads:[~2013-04-07 19:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-07 11:52 Some %elements in org-html-postamble-format became too "generous" Dieter Wilhelm
2013-04-07 13:04 ` Nicolas Goaziou
2013-04-07 16:26 ` Dieter Wilhelm
2013-04-07 17:35 ` Dieter Wilhelm
2013-04-07 18:35 ` Nicolas Goaziou
2013-04-07 18:32 ` Nicolas Goaziou
2013-04-07 18:51 ` Rick Frankel
2013-04-07 19:00 ` Nicolas Goaziou [this message]
2013-04-09 1:55 ` Rick Frankel
2013-04-10 12:44 ` Nicolas Goaziou
2013-04-10 13:15 ` [PATCH] org-contacts.el, add alias properties Feng Shu
2013-04-10 13:18 ` Bastien
2013-04-09 5:46 ` Some %elements in org-html-postamble-format became too "generous" Dieter Wilhelm
2013-04-09 9:54 ` Bastien
2013-04-10 18:13 ` Dieter Wilhelm
2013-04-07 20:52 ` Dieter Wilhelm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sj32w4hg.fsf@gmail.com \
--to=n.goaziou@gmail.com \
--cc=dieter@duenenhof-wilhelm.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).