[Accepted] [O] Re: [REGRESSION] org-html.el (targets)

[Bastien Guerry <bzg@altern.org>]

Patch 664 (http://patchwork.newartisans.com/patch/664/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87fwqwnxj6.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: [O] Re: [REGRESSION] org-html.el (targets)
> Date: Wed, 09 Mar 2011 20:06:37 -0000
> From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> X-Patchwork-Id: 664
> Message-Id: <87fwqwnxj6.fsf@univ-nantes.fr>
> To: Bastien <bzg@altern.org>
> Cc: Bernt Hansen <bernt@norang.ca>, Aankhen <aankhen@gmail.com>,
> 	Org-mode ml <emacs-orgmode@gnu.org>
> 
> Bastien <bzg@altern.org> writes:
> 
> > Bastien <bzg@gnu.org> 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.
> 
> 
> >From a9e692243b37be9947db9a7220ea561d261deaba Mon Sep 17 00:00:00 2001
> From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> 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 <aankhen@gmail.com>)
>         (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 "<caption>%s</caption>" (or caption "")) html)
> -      (when label (push (format "<a name=\"%s\" id=\"%s\"></a>" (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
> 
>