diff --git a/docs/qanda b/docs/qanda
index 23ec4d9..ac1dfb7 100644
--- a/docs/qanda
+++ b/docs/qanda
@@ -344,8 +344,8 @@
 		��������������������������������
 	
 	�Ăȋ�ɂȂ�킯�ł���B���������傦���B���āA������program��
-	���̃}�N����`��ǂ�����Ɗ‹��ɓn���� foo.c �͂��̂܂�
-	\label{#1} �Ń��x���Ƃ��Ď����I�ɑł���邱�ƂɂȂ�B���ApLaTeX 
+	���̃}�N����`��ǂ�����Ɗ‹��ɓn���� foo.c �͂��̂܂܎����I��
+	\label{#1} �Ń��x���Ƃ��đł���邱�ƂɂȂ�܂��B���ApLaTeX 
 	�̃��x���͓��{���OK��B�ŁA���̈Öق̂����ɑł��ꂽ���x�������
 	���ɋ�����Ƃ����̂��X�}�[�g�Ȃ����ł��B������`����̂��ϐ�
 	YaTeX::ref-labeling-regexp-alist-private �Ȃ�B����ɂ�
diff --git a/yahtml.el b/yahtml.el
index 448607c..134470a 100644
--- a/yahtml.el
+++ b/yahtml.el
@@ -1,6 +1,6 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; (c) 1994-2011 by HIROSE Yuuji [yuuji(@)yatex.org]
-;;; Last modified Sat Dec 17 13:00:34 2011 on firestorm
+;;; Last modified Mon May 16 15:49:38 2011 on firestorm
 ;;; $Id$
 
 (defconst yahtml-revision-number "1.74.2"
diff --git a/yatexlib.el b/yatexlib.el
index ef9c4bd..fccd06c 100644
--- a/yatexlib.el
+++ b/yatexlib.el
@@ -2,7 +2,7 @@
 ;;; YaTeX and yahtml common libraries, general functions and definitions
 ;;; yatexlib.el
 ;;; (c)1994-2009 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Fri Feb 18 15:05:08 2011 on firestorm
+;;; Last modified Thu Dec 15 13:37:26 2011 on firestorm
 ;;; $Id$
 
 ;; General variables
@@ -530,11 +530,15 @@
 (cond
  ((fboundp 'screen-height)
   (fset 'YaTeX-screen-height 'screen-height)
-  (fset 'YaTeX-screen-width 'screen-width))
+  (fset 'YaTeX-screen-width 'screen-width)
+  (fset 'YaTeX-set-screen-height 'set-screen-height)
+  (fset 'YaTeX-set-screen-width 'set-screen-width))
  ((fboundp 'frame-height)
   (fset 'YaTeX-screen-height 'frame-height)
-  (fset 'YaTeX-screen-width 'frame-width))
- (t (error "I don't know how to run windows.el on this Emacs...")))
+  (fset 'YaTeX-screen-width 'frame-width)
+  (fset 'YaTeX-set-screen-height 'set-frame-height)
+  (fset 'YaTeX-set-screen-width 'set-frame-width))
+ (t (error "I don't know how to run YaTeX on this Emacs...")))
 
 ;;;###autoload
 (defun split-window-calculate-height (height)
@@ -908,7 +912,7 @@
 		    (goto-char m0)
 		    (put 'YaTeX-inner-environment 'indent (current-column))
 		    (throw 'begin t)))))
-	  (buffer-substring
+	  (YaTeX-buffer-substring
 	   (progn (skip-chars-forward open) (1+ (point)))
 	   (progn (skip-chars-forward close) (point)))))))
 
@@ -994,9 +998,16 @@
   (let ((env (YaTeX-inner-environment)))
     (if (not env) (error "No premature environment")
       (save-excursion
-	(if (YaTeX-search-active-forward
-	     (YaTeX-replace-format-args YaTeX-struct-end env "" "")
-	     YaTeX-comment-prefix nil t)
+	(if (and
+	     (YaTeX-re-search-active-forward
+	      (concat
+	       "\\(" (YaTeX-replace-format-args
+		      YaTeX-struct-end env "" "")
+	       "\\)\\|\\(" (YaTeX-replace-format-args
+		      YaTeX-struct-begin env "" "")
+	       "\\)")
+	      YaTeX-comment-prefix nil t)
+	     (match-beginning 1))	;is closing struc.
 	    (if (y-or-n-p
 		 (concat "Environment `" env
 			 "' may be already closed. Force close?"))