From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Christian Plate <cplate@web.de>
Newsgroups: gmane.emacs.devel
Subject: Re: [pot@gnu.org: (setq sgml-transformation 'upcase) has no effect]
Date: Thu, 17 May 2007 19:00:02 +0200
Message-ID: <200705171900.02464.cplate@web.de>
References: <E1Hockl-0000xc-MP@fencepost.gnu.org>
	<200705171329.36410.cplate@web.de>
	<jwvmz03k05o.fsf-monnier+emacs@gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SoITGz0Dprt0Z1G"
X-Trace: sea.gmane.org 1179421278 16989 80.91.229.12 (17 May 2007 17:01:18 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Thu, 17 May 2007 17:01:18 +0000 (UTC)
Cc: rms@gnu.org, emacs-devel@gnu.org
To: Stefan Monnier <monnier@iro.umontreal.ca>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 17 19:01:17 2007
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1HojLm-0006Zl-Tg
	for ged-emacs-devel@m.gmane.org; Thu, 17 May 2007 19:01:15 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1HojTt-0008HH-MW
	for ged-emacs-devel@m.gmane.org; Thu, 17 May 2007 13:09:37 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HojTB-0007zi-Mz
	for emacs-devel@gnu.org; Thu, 17 May 2007 13:08:53 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HojTB-0007zM-8f
	for emacs-devel@gnu.org; Thu, 17 May 2007 13:08:53 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HojTA-0007zG-NW
	for emacs-devel@gnu.org; Thu, 17 May 2007 13:08:52 -0400
Original-Received: from fmmailgate02.web.de ([217.72.192.227])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <cplate@web.de>)
	id 1HojL1-0001hC-3N; Thu, 17 May 2007 13:00:27 -0400
Original-Received: from smtp07.web.de (fmsmtp07.dlan.cinetic.de [172.20.5.215])
	by fmmailgate02.web.de (Postfix) with ESMTP id CBFDD7E78D85;
	Thu, 17 May 2007 19:00:01 +0200 (CEST)
Original-Received: from [84.163.103.198] (helo=noname)
	by smtp07.web.de with esmtp (TLSv1:AES256-SHA:256)
	(WEB.DE 4.108 #197)
	id 1HojKa-0007Z5-00; Thu, 17 May 2007 19:00:01 +0200
User-Agent: KMail/1.9.5
In-Reply-To: <jwvmz03k05o.fsf-monnier+emacs@gnu.org>
X-Sender: cplate@web.de
X-Provags-ID: V01U2FsdGVkX1/TGn2d1Jn8olCg2kBrxgND1f0ALWUJZJcOEhjL
	CNBemuV+TzN/2jig4690Fl2U1+E5WFJAZIH7i9XcVx6GghhaUt e1E1+y16k=
X-detected-kernel: Linux 2.4-2.6
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:71261
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/71261>

--Boundary-00=_SoITGz0Dprt0Z1G
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Thursday 17 May 2007 16:14, Stefan Monnier wrote:
> That will only fix some cases, but not all.

I have attached the fix for all cases.

Regards,  Christian


--Boundary-00=_SoITGz0Dprt0Z1G
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="sgml-mode.el.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="sgml-mode.el.diff"

Index: sgml-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/sgml-mode.el,v
retrieving revision 1.124
diff -c -r1.124 sgml-mode.el
*** sgml-mode.el	17 May 2007 13:31:51 -0000	1.124
--- sgml-mode.el	17 May 2007 16:56:21 -0000
***************
*** 676,687 ****
  	(if (stringp (car alist))
  	    (progn
  	      (insert (if (eq (preceding-char) ?\s) "" ?\s)
! 		      (funcall skeleton-transformation-function (car alist)))
  	      (sgml-value alist))
  	  (setq i (length alist))
  	  (while (> i 0)
  	    (insert ?\s)
! 	    (insert (funcall skeleton-transformation-function
  			     (setq attribute
  				   (skeleton-read '(completing-read
  						    "Attribute: "
--- 676,687 ----
  	(if (stringp (car alist))
  	    (progn
  	      (insert (if (eq (preceding-char) ?\s) "" ?\s)
! 		      (funcall sgml-transformation-function (car alist)))
  	      (sgml-value alist))
  	  (setq i (length alist))
  	  (while (> i 0)
  	    (insert ?\s)
! 	    (insert (funcall sgml-transformation-function
  			     (setq attribute
  				   (skeleton-read '(completing-read
  						    "Attribute: "
***************
*** 1921,2026 ****
  (define-skeleton html-href-anchor
    "HTML anchor tag with href attribute."
    "URL: "
!   ;; '(setq input "http:")
!   "<a href=\"" str "\">" _ "</a>")
  
  (define-skeleton html-name-anchor
    "HTML anchor tag with name attribute."
    "Name: "
!   "<a name=\"" str "\""
!   (if sgml-xml-mode (concat " id=\"" str "\""))
!   ">" _ "</a>")
  
  (define-skeleton html-headline-1
    "HTML level 1 headline tags."
    nil
!   "<h1>" _ "</h1>")
  
  (define-skeleton html-headline-2
    "HTML level 2 headline tags."
    nil
!   "<h2>" _ "</h2>")
  
  (define-skeleton html-headline-3
    "HTML level 3 headline tags."
    nil
!   "<h3>" _ "</h3>")
  
  (define-skeleton html-headline-4
    "HTML level 4 headline tags."
    nil
!   "<h4>" _ "</h4>")
  
  (define-skeleton html-headline-5
    "HTML level 5 headline tags."
    nil
!   "<h5>" _ "</h5>")
  
  (define-skeleton html-headline-6
    "HTML level 6 headline tags."
    nil
!   "<h6>" _ "</h6>")
  
  (define-skeleton html-horizontal-rule
    "HTML horizontal rule tag."
    nil
!   (if sgml-xml-mode "<hr />" "<hr>") \n)
  
  (define-skeleton html-image
    "HTML image tag."
    "Image URL: "
!   "<img src=\"" str "\" alt=\"" _ "\""
    (if sgml-xml-mode " />" ">"))
  
  (define-skeleton html-line
    "HTML line break tag."
    nil
!   (if sgml-xml-mode "<br />" "<br>") \n)
  
  (define-skeleton html-ordered-list
    "HTML ordered list tags."
    nil
!   "<ol>" \n
!   "<li>" _ (if sgml-xml-mode "</li>") \n
!   "</ol>")
  
  (define-skeleton html-unordered-list
    "HTML unordered list tags."
    nil
!   "<ul>" \n
!   "<li>" _ (if sgml-xml-mode "</li>") \n
!   "</ul>")
  
  (define-skeleton html-list-item
    "HTML list item tag."
    nil
    (if (bolp) nil '\n)
!   "<li>" _ (if sgml-xml-mode "</li>"))
  
  (define-skeleton html-paragraph
    "HTML paragraph tag."
    nil
    (if (bolp) nil ?\n)
!   "<p>" _ (if sgml-xml-mode "</p>"))
! 
  (define-skeleton html-checkboxes
    "Group of connected checkbox inputs."
    nil
    '(setq v1 nil
  	 v2 nil)
    ("Value: "
!    "<input type=\"" (identity "checkbox") ; see comment above about identity
!    "\" name=\"" (or v1 (setq v1 (skeleton-read "Name: ")))
!    "\" value=\"" str ?\"
     (when (y-or-n-p "Set \"checked\" attribute? ")
!      (funcall skeleton-transformation-function
! 	      (if sgml-xml-mode " checked=\"checked\"" " checked")))
     (if sgml-xml-mode " />" ">")
     (skeleton-read "Text: " (capitalize str))
     (or v2 (setq v2 (if (y-or-n-p "Newline after text? ")
! 		       (funcall skeleton-transformation-function
!                                 (if sgml-xml-mode "<br />" "<br>"))
! 		     "")))
     \n))
  
  (define-skeleton html-radio-buttons
--- 1921,2058 ----
  (define-skeleton html-href-anchor
    "HTML anchor tag with href attribute."
    "URL: "
!   (funcall sgml-transformation-function "<a href=\"") 
!   str "\">" _ (funcall sgml-transformation-function "</a>"))
  
  (define-skeleton html-name-anchor
    "HTML anchor tag with name attribute."
    "Name: "
!   (funcall sgml-transformation-function "<a name=\"") 
!   str "\""
!   (if sgml-xml-mode (concat (funcall sgml-transformation-function " id=\"") 
! 			    str "\""))
!   ">" _ (funcall sgml-transformation-function "</a>"))
  
  (define-skeleton html-headline-1
    "HTML level 1 headline tags."
    nil
!   (funcall sgml-transformation-function "<h1>") 
!   _ 
!   (funcall sgml-transformation-function "</h1>"))
  
  (define-skeleton html-headline-2
    "HTML level 2 headline tags."
    nil
!   (funcall sgml-transformation-function "<h2>")
!   _ 
!   (funcall sgml-transformation-function "</h2>"))
  
  (define-skeleton html-headline-3
    "HTML level 3 headline tags."
    nil
!   (funcall sgml-transformation-function "<h3>")
!   _ 
!   (funcall sgml-transformation-function "</h3>"))
  
  (define-skeleton html-headline-4
    "HTML level 4 headline tags."
    nil
!   (funcall sgml-transformation-function "<h4>")
!   _ 
!   (funcall sgml-transformation-function "</h4>"))
  
  (define-skeleton html-headline-5
    "HTML level 5 headline tags."
    nil
!   (funcall sgml-transformation-function "<h5>")
!   _ 
!   (funcall sgml-transformation-function "</h5>"))
  
  (define-skeleton html-headline-6
    "HTML level 6 headline tags."
    nil
!   (funcall sgml-transformation-function "<h6>")
!   _ 
!   (funcall sgml-transformation-function "</h6>"))
  
  (define-skeleton html-horizontal-rule
    "HTML horizontal rule tag."
    nil
!   (if sgml-xml-mode 
!       (funcall sgml-transformation-function "<hr />")
!     (funcall sgml-transformation-function "<hr>")) \n)
  
  (define-skeleton html-image
    "HTML image tag."
    "Image URL: "
!   (funcall sgml-transformation-function "<img src=\"")
!   str (funcall sgml-transformation-function "\" alt=\"")
!   _ "\""
    (if sgml-xml-mode " />" ">"))
  
  (define-skeleton html-line
    "HTML line break tag."
    nil
!   (if sgml-xml-mode 
!       (funcall sgml-transformation-function "<br />")
!     (funcall sgml-transformation-function "<br>")) \n)
  
  (define-skeleton html-ordered-list
    "HTML ordered list tags."
    nil
!   (funcall sgml-transformation-function "<ol>") \n
!   (funcall sgml-transformation-function "<li>")
!   _ 
!   (if sgml-xml-mode (funcall sgml-transformation-function "</li>")) \n
!   (funcall sgml-transformation-function "</ol>"))
  
  (define-skeleton html-unordered-list
    "HTML unordered list tags."
    nil
!   (funcall sgml-transformation-function "<ul>") \n
!   (funcall sgml-transformation-function "<li>")
!   _ 
!   (if sgml-xml-mode (funcall sgml-transformation-function "</li>")) \n
!   (funcall sgml-transformation-function "</ul>"))
  
  (define-skeleton html-list-item
    "HTML list item tag."
    nil
    (if (bolp) nil '\n)
!   (funcall sgml-transformation-function "<li>")
!   _ 
!   (if sgml-xml-mode (funcall sgml-transformation-function "</li>")))
  
  (define-skeleton html-paragraph
    "HTML paragraph tag."
    nil
    (if (bolp) nil ?\n)
!   (funcall sgml-transformation-function "<p>") 
!   _ 
!   (if sgml-xml-mode (funcall sgml-transformation-function "</p>")))
!   
  (define-skeleton html-checkboxes
    "Group of connected checkbox inputs."
    nil
    '(setq v1 nil
  	 v2 nil)
    ("Value: "
!    (funcall sgml-transformation-function "<input type=\"")
!    (identity "checkbox") ; see comment above about identity
!    (funcall sgml-transformation-function "\" name=\"")
!    (or v1 (setq v1 (skeleton-read "Name: ")))
!    (funcall sgml-transformation-function "\" value=\"")
!    str ?\"
     (when (y-or-n-p "Set \"checked\" attribute? ")
!      (if sgml-xml-mode 
! 	 (funcall sgml-transformation-function " checked=\"checked\"")
!        (funcall sgml-transformation-function " checked")))
     (if sgml-xml-mode " />" ">")
     (skeleton-read "Text: " (capitalize str))
     (or v2 (setq v2 (if (y-or-n-p "Newline after text? ")
! 		       (funcall sgml-transformation-function 
! 				(if sgml-xml-mode "<br />" "<br>"))
! 		     ""))) 
     \n))
  
  (define-skeleton html-radio-buttons
***************
*** 2029,2044 ****
    '(setq v1 nil
  	 v2 (cons nil nil))
    ("Value: "
!    "<input type=\"" (identity "radio") ; see comment above about identity
!    "\" name=\"" (or (car v2) (setcar v2 (skeleton-read "Name: ")))
!    "\" value=\"" str ?\"
     (when (and (not v1) (setq v1 (y-or-n-p "Set \"checked\" attribute? ")))
!      (funcall skeleton-transformation-function
! 	      (if sgml-xml-mode " checked=\"checked\"" " checked")))
     (if sgml-xml-mode " />" ">")
     (skeleton-read "Text: " (capitalize str))
     (or (cdr v2) (setcdr v2 (if (y-or-n-p "Newline after text? ")
! 			       (funcall skeleton-transformation-function
                                          (if sgml-xml-mode "<br />" "<br>"))
  			     "")))
     \n))
--- 2061,2081 ----
    '(setq v1 nil
  	 v2 (cons nil nil))
    ("Value: "
!    (funcall sgml-transformation-function "<input type=\"")
!    (identity "radio") ; see comment above about identity
!    (funcall sgml-transformation-function "\" name=\"")
!    (or (car v2) (setcar v2 (skeleton-read "Name: ")))
!    (funcall sgml-transformation-function "\" value=\"")
!    str ?\"
     (when (and (not v1) (setq v1 (y-or-n-p "Set \"checked\" attribute? ")))
!      (funcall sgml-transformation-function
! 	      (if sgml-xml-mode 
! 		  " checked=\"checked\""
! 		" checked")))
     (if sgml-xml-mode " />" ">")
     (skeleton-read "Text: " (capitalize str))
     (or (cdr v2) (setcdr v2 (if (y-or-n-p "Newline after text? ")
! 			       (funcall sgml-transformation-function
                                          (if sgml-xml-mode "<br />" "<br>"))
  			     "")))
     \n))

--Boundary-00=_SoITGz0Dprt0Z1G
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
--Boundary-00=_SoITGz0Dprt0Z1G--