From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <dominik@science.uva.nl>
Subject: Re: Valid XHTML
Date: Sun, 2 Nov 2008 07:40:41 +0100
Message-ID: <4CD60E90-62A8-4F72-A731-2CC106663C0B@uva.nl>
References: <490B6274.8090507@gmx.de> <4904E4C6.4080404@gmx.de>
	<49051167.2080900@gmx.de>
Mime-Version: 1.0 (Apple Message framework v929.2)
Content-Type: text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KwWsH-0005IS-IY
	for emacs-orgmode@gnu.org; Sun, 02 Nov 2008 01:55:49 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KwWsG-0005I6-RF
	for emacs-orgmode@gnu.org; Sun, 02 Nov 2008 01:55:49 -0500
Received: from [199.232.76.173] (port=47200 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KwWsG-0005Ht-LI
	for emacs-orgmode@gnu.org; Sun, 02 Nov 2008 01:55:48 -0500
Received: from nf-out-0910.google.com ([64.233.182.190]:58725)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <carsten.dominik@gmail.com>) id 1KwWsG-0005Wo-3U
	for emacs-orgmode@gnu.org; Sun, 02 Nov 2008 01:55:48 -0500
Received: by nf-out-0910.google.com with SMTP id c7so970523nfi.26
	for <emacs-orgmode@gnu.org>; Sat, 01 Nov 2008 23:55:47 -0700 (PDT)
In-Reply-To: <49051167.2080900@gmx.de>
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/pipermail/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: sebastian_rose@gmx.de
Cc: "[emacs-orgmode]" <emacs-orgmode@gnu.org>

Applied, thanks.

- Carsten

On Oct 27, 2008, at 1:55 AM, Sebastian Rose wrote:

> Hi,
>
>
>
> 1.) ERR
>
>   SSTOOOP!!!
>
>  Sebastian Rose wrote:
>> <a href="x.php%3Fa%3Db%26c%3Dd">x.php?a=b&amp;c=d</a>
>>                  ^                        ^
>> urlencoded--------'              entities--'
>
>
>  Sorry, that's bullsh... This is one of the errors, that goes away, if
>
>
>  <a href="x.php?a=b&c=d">x.php?a=b&amp;c=d</a>
>                                   ^
>                         entities--'
>
>
>
> 2.) Fix for 'no <pre> in <p> (XHTML)':
>
>  The appended patch fixes this. Don't know if it is correct, but I
>  tested repeatedly with various files and it seems OK. No empty <p>
>  elements remain.
>
>
>
>
> Regards,
>
>   Sebastian
> diff --git a/lisp/org-exp.el b/lisp/org-exp.el
> index 4153554..8762843 100644
> --- a/lisp/org-exp.el
> +++ b/lisp/org-exp.el
> @@ -3102,6 +3102,7 @@ lang=\"%s\" xml:lang=\"%s\">
> 		     (string-match "^[ \t]*:\\(.*\\)" line))
> 	    (when (not infixed)
> 	      (setq infixed t)
> +          (org-close-par-maybe)
> 	      (insert "<pre class=\"example\">\n"))
> 	    (insert (org-html-protect (match-string 1 line)) "\n")
> 	    (when (or (not lines)
> @@ -3339,6 +3340,7 @@ lang=\"%s\" xml:lang=\"%s\">
> 				  head-count)
> 	    ;; QUOTES
> 	    (when (string-match quote-re line)
> +          (org-close-par-maybe)
> 	      (insert "<pre>")
> 	      (setq inquote t)))
>
> @@ -3449,7 +3451,7 @@ lang=\"%s\" xml:lang=\"%s\">
> 	    (insert line "\n")))))
>
>       ;; Properly close all local lists and other lists
> -      (when inquote (insert "</pre>\n"))
> +      (when inquote (insert "</pre>\n") (org-open-par))
>       (when in-local-list
> 	;; Close any local lists before inserting a new header line
> 	(while local-list-type
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode