yatex
changeset 191:af2098da767b dev
make dev branch single
| author | yuuji@gentei.org |
|---|---|
| date | Sat, 17 Dec 2011 13:07:38 +0900 |
| parents | 3db120d6b7d1 2f91947a43a1 |
| children | 7cf62e088eb5 |
| files | yahtml.el yatex.el |
| diffstat | 3 files changed, 22 insertions(+), 11 deletions(-) [+] |
line diff
1.1 --- a/docs/qanda Sat Dec 17 13:02:40 2011 +0900 1.2 +++ b/docs/qanda Sat Dec 17 13:07:38 2011 +0900 1.3 @@ -344,8 +344,8 @@ 1.4 └──────────────┘ 1.5 1.6 てな具合になるわけですよ。おおかちょええ。さて、小文字program環 1.7 - 境のマクロ定義を良く見ると環境に渡した foo.c はそのまま 1.8 - \label{#1} でラベルとして自動的に打たれることになる。あ、pLaTeX 1.9 + 境のマクロ定義を良く見ると環境に渡した foo.c はそのまま自動的に 1.10 + \label{#1} でラベルとして打たれることになります。あ、pLaTeX 1.11 のラベルは日本語もOKよ。で、その暗黙のうちに打たれたラベル名を野 1.12 鳥に教えるというのがスマートなやり方です。これを定義するのが変数 1.13 YaTeX::ref-labeling-regexp-alist-private なり。これには
2.1 --- a/yahtml.el Sat Dec 17 13:02:40 2011 +0900 2.2 +++ b/yahtml.el Sat Dec 17 13:07:38 2011 +0900 2.3 @@ -1,6 +1,6 @@ 2.4 ;;; -*- Emacs-Lisp -*- 2.5 ;;; (c) 1994-2011 by HIROSE Yuuji [yuuji(@)yatex.org] 2.6 -;;; Last modified Sat Dec 17 13:00:34 2011 on firestorm 2.7 +;;; Last modified Mon May 16 15:49:38 2011 on firestorm 2.8 ;;; $Id$ 2.9 2.10 (defconst yahtml-revision-number "1.74.2"
3.1 --- a/yatexlib.el Sat Dec 17 13:02:40 2011 +0900 3.2 +++ b/yatexlib.el Sat Dec 17 13:07:38 2011 +0900 3.3 @@ -2,7 +2,7 @@ 3.4 ;;; YaTeX and yahtml common libraries, general functions and definitions 3.5 ;;; yatexlib.el 3.6 ;;; (c)1994-2009 by HIROSE Yuuji.[yuuji@yatex.org] 3.7 -;;; Last modified Fri Feb 18 15:05:08 2011 on firestorm 3.8 +;;; Last modified Thu Dec 15 13:37:26 2011 on firestorm 3.9 ;;; $Id$ 3.10 3.11 ;; General variables 3.12 @@ -530,11 +530,15 @@ 3.13 (cond 3.14 ((fboundp 'screen-height) 3.15 (fset 'YaTeX-screen-height 'screen-height) 3.16 - (fset 'YaTeX-screen-width 'screen-width)) 3.17 + (fset 'YaTeX-screen-width 'screen-width) 3.18 + (fset 'YaTeX-set-screen-height 'set-screen-height) 3.19 + (fset 'YaTeX-set-screen-width 'set-screen-width)) 3.20 ((fboundp 'frame-height) 3.21 (fset 'YaTeX-screen-height 'frame-height) 3.22 - (fset 'YaTeX-screen-width 'frame-width)) 3.23 - (t (error "I don't know how to run windows.el on this Emacs..."))) 3.24 + (fset 'YaTeX-screen-width 'frame-width) 3.25 + (fset 'YaTeX-set-screen-height 'set-frame-height) 3.26 + (fset 'YaTeX-set-screen-width 'set-frame-width)) 3.27 + (t (error "I don't know how to run YaTeX on this Emacs..."))) 3.28 3.29 ;;;###autoload 3.30 (defun split-window-calculate-height (height) 3.31 @@ -908,7 +912,7 @@ 3.32 (goto-char m0) 3.33 (put 'YaTeX-inner-environment 'indent (current-column)) 3.34 (throw 'begin t))))) 3.35 - (buffer-substring 3.36 + (YaTeX-buffer-substring 3.37 (progn (skip-chars-forward open) (1+ (point))) 3.38 (progn (skip-chars-forward close) (point))))))) 3.39 3.40 @@ -994,9 +998,16 @@ 3.41 (let ((env (YaTeX-inner-environment))) 3.42 (if (not env) (error "No premature environment") 3.43 (save-excursion 3.44 - (if (YaTeX-search-active-forward 3.45 - (YaTeX-replace-format-args YaTeX-struct-end env "" "") 3.46 - YaTeX-comment-prefix nil t) 3.47 + (if (and 3.48 + (YaTeX-re-search-active-forward 3.49 + (concat 3.50 + "\\(" (YaTeX-replace-format-args 3.51 + YaTeX-struct-end env "" "") 3.52 + "\\)\\|\\(" (YaTeX-replace-format-args 3.53 + YaTeX-struct-begin env "" "") 3.54 + "\\)") 3.55 + YaTeX-comment-prefix nil t) 3.56 + (match-beginning 1)) ;is closing struc. 3.57 (if (y-or-n-p 3.58 (concat "Environment `" env 3.59 "' may be already closed. Force close?"))