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