From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manuel Giraud Subject: Re: Re: [REGRESSION] org-html.el (targets) Date: Wed, 09 Mar 2011 16:06:37 +0100 Message-ID: <87fwqwnxj6.fsf@univ-nantes.fr> References: <81r5b2frh9.fsf@gmail.com> <877hcarjom.fsf@univ-nantes.fr> <87wrkak6q9.fsf@norang.ca> <87pqq1535i.fsf@univ-nantes.fr> <87wrk8varc.fsf@gnu.org> <87pqq0vap5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from [140.186.70.92] (port=41904 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxL1s-0002XL-3F for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 10:10:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxKzF-0006W9-KY for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 10:07:47 -0500 Received: from smtp-tls1.univ-nantes.fr ([193.52.101.145]:59245 helo=smtp-tls.univ-nantes.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxKzF-0006Vf-69 for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 10:07:41 -0500 In-Reply-To: <87pqq0vap5.fsf@gnu.org> (Bastien's message of "Wed, 09 Mar 2011 11:40:22 +0100") 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: Bastien Cc: Bernt Hansen , Aankhen , Org-mode ml --=-=-= Bastien writes: > Bastien writes: > >> May I ask you to rewrite these patches into a single one? > > PS: I mean: merge all patches in this thread relevant to the problem, > possibly including Aankhen patch. Thanks! Ok, here it is. Hopes this one's ok. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Correct-HTML-export-of-dedicated-target.patch >From a9e692243b37be9947db9a7220ea561d261deaba Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Wed, 9 Mar 2011 16:03:43 +0100 Subject: [PATCH] Correct HTML export of dedicated target. * org-html.el (org-format-org-table-html): fix anchors in HTML export (thanks to ) (org-html-protect): fix a bug that prevents some target to be rendered correctly. * org-exp.el (org-solidify-link-text): a single "-" to avoid a "&ndash" rewrite in HTML export later. --- lisp/org-exp.el | 2 +- lisp/org-html.el | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 709317a..dff86b6 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2062,7 +2062,7 @@ can work correctly." (let* ((rtn (mapconcat 'identity - (org-split-string s "[^a-zA-Z0-9_\\.-]+") "--")) + (org-split-string s "[^a-zA-Z0-9_\\.-]+") "-")) (a (assoc rtn alist))) (or (cdr a) rtn)))) diff --git a/lisp/org-html.el b/lisp/org-html.el index 333cf4d..54cbf36 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1996,8 +1996,8 @@ for formatting. This is required for the DocBook exporter." ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format "%s" (or caption "")) html) - (when label (push (format "" (org-solidify-link-text label) (org-solidify-link-text label)) - html)) + (when label + (setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label))))) (push html-table-tag html)) (setq html (mapcar (lambda (x) @@ -2181,12 +2181,12 @@ that uses these same face definitions." (defun org-html-protect (s) "Convert characters to HTML equivalent. Possible conversions are set in `org-export-html-protect-char-alist'." - (let ((start 0) - (cl org-export-html-protect-char-alist) c) + (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) - (while (string-match (car c) s start) - (setq s (replace-match (cdr c) t t s) - start (1+ (match-beginning 0))))) + (let ((start 0)) + (while (string-match (car c) s start) + (setq s (replace-match (cdr c) t t s) + start (match-beginning 0))))) s)) (defun org-html-expand (string) -- 1.7.1 --=-=-= -- Manuel Giraud --=-=-=--