From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jason Dunsmore <emacs-orgmode@dunsmor.com>
Subject: [PATCH] [BUG] Timestamps surrounded by @@ in HTML export
Date: Tue, 01 Feb 2011 09:37:57 -0600
Message-ID: <8762t3oje2.fsf@riotblast.dunsmor.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=57645 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PkIIu-0001ep-VK
	for emacs-orgmode@gnu.org; Tue, 01 Feb 2011 10:38:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jason@dunsmor.com>) id 1PkIIp-0006TT-QU
	for emacs-orgmode@gnu.org; Tue, 01 Feb 2011 10:38:00 -0500
Received: from deathroller.dunsmor.com ([98.129.169.48]:33981)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jason@dunsmor.com>) id 1PkIIp-0006T6-KT
	for emacs-orgmode@gnu.org; Tue, 01 Feb 2011 10:37:59 -0500
Received: from riotblast.dunsmor.com (65-36-72-143.dyn.grandenetworks.net
	[65.36.72.143])
	by deathroller.dunsmor.com (Postfix) with ESMTP id 26D938C30F
	for <emacs-orgmode@gnu.org>; Tue,  1 Feb 2011 09:37:14 -0600 (CST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Org-mode mailing list <emacs-orgmode@gnu.org>

I noticed in the latest Git version that each inactive timestamp has
"@@" before and after it in HTML exported output.  Here is a patch that
fixes it.

diff --git a/lisp/org-html.el b/lisp/org-html.el
index 6c0e5e3..2f0377b 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -2124,14 +2124,14 @@ But it has the disadvantage, that Org-mode's HTML conver
        (or b (setq b (substring s 0 (match-beginning 0))))
        (setq r (concat
                 r (substring s 0 (match-beginning 0))
-                " @<span class=\"timestamp-wrapper\">"
+                " <span class=\"timestamp-wrapper\">"
                 (if (match-end 1)
-                    (format "@<span class=\"timestamp-kwd\">%s @</span>"
+                    (format "<span class=\"timestamp-kwd\">%s </span>"
                             (match-string 1 s)))
-                (format " @<span class=\"timestamp\">%s@</span>"
+                (format " <span class=\"timestamp\">%s</span>"
                         (substring
                          (org-translate-time (match-string 3 s)) 1 -1))
-                "@</span>")
+                "</span>")
              s (substring s (match-end 0))))
       ;; Line break if line started and ended with time stamp stuff
       (if (not r)