emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bastien Guerry <bzg@altern.org>
To: emacs-orgmode@gnu.org
Subject: [Accepted] [O] Re: [REGRESSION] org-html.el (targets)
Date: Wed,  9 Mar 2011 16:38:06 +0100 (CET)	[thread overview]
Message-ID: <20110309153806.1FBFD6A2D@myhost.localdomain> (raw)
In-Reply-To: 87fwqwnxj6.fsf@univ-nantes.fr

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

  reply	other threads:[~2011-03-09 15:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-20 19:14 [REGRESSION] org-html.el (targets) Jambunathan K
2011-03-07 16:15 ` Manuel Giraud
2011-03-07 20:37   ` Bernt Hansen
2011-03-08  7:14     ` Aankhen
2011-03-08 10:15       ` Manuel Giraud
2011-03-08 15:02         ` Bernt Hansen
2011-03-09 10:39         ` Bastien
2011-03-09 10:40           ` Bastien
2011-03-09 15:06             ` Manuel Giraud
2011-03-09 15:38               ` Bastien Guerry [this message]
2011-03-09 15:40               ` Bastien
2011-03-09 10:36       ` Bastien
2011-03-09 19:27         ` Aankhen

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=20110309153806.1FBFD6A2D@myhost.localdomain \
    --to=bzg@altern.org \
    --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).