Mercurial > hgrepos > hgweb.cgi > yatex
changeset 61:b9f753846b6b
Bug fix release
| author | yuuji |
|---|---|
| date | Mon, 07 Apr 1997 20:07:48 +0000 |
| parents | 9e08ed569d80 |
| children | 7fb74de5a4e8 |
| files | help/YATEXHLP.jp yahtml.el yatex.el yatex.new yatex19.el yatexenv.el yatexhks.el yatexprc.el yatexsec.el |
| diffstat | 9 files changed, 88 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/help/YATEXHLP.jp Fri Jan 24 09:04:06 1997 +0000 +++ b/help/YATEXHLP.jp Mon Apr 07 20:07:48 1997 +0000 @@ -1281,14 +1281,17 @@ と相談すると、「いらん」と一蹴し、しばらく経ってから「やっぱり欲 しい」と言うなど、多くの混乱を招かせていただきました。 + 1997年3月10日、交通事故により愛機ZZ-R1100(D1)と共にあの世へ旅立 + たれました。享年二十六歳。彼には、野鳥だけでなく私が手掛けた数多 + くのソフトウェアを作る動機、センスあふれるコメントなどを頂きまし + た。現在の野鳥が皆様に支持されるように健やかに育ったのは彼のおか + げと言っても過言ではありません。野鳥/雷鳥/白鳥を使うときに彼の安 + らかな眠りを私と共に祈って下さい。 + るねきちさん(asciinet) 占い師だそうです。 http://www.comp.ae.keio.ac.jp/~yuuji/lune/astrology/ -柱川さん(prc) - 各所で暴れています。 - http://www.prc.tsukuba.ac.jp/~katsura/ - 三平善郎さん(慶應大) 開き括弧の入力時の処理のモード分けのアイデアを頂きました。
--- a/yahtml.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yahtml.el Mon Apr 07 20:07:48 1997 +0000 @@ -1,6 +1,6 @@ ;;; -*- Emacs-Lisp -*- ;;; (c ) 1994-1997 by HIROSE Yuuji [yuuji@ae.keio.ac.jp] -;;; Last modified Fri Jan 24 18:03:01 1997 on supra +;;; Last modified Mon Apr 7 16:58:32 1997 on crx ;;; $Id$ ;;;[Installation] @@ -115,7 +115,7 @@ (yahtml-define-begend-key-normal key env map) (if YaTeX-inhibit-prefix-letter nil (yahtml-define-begend-region-key - (concat (upcase (substring key 0 1)) (substring key 1)) env))) + (concat (upcase (substring key 0 1)) (substring key 1)) env map))) (if yahtml-mode-map nil @@ -146,8 +146,10 @@ (YaTeX-define-key ")" 'YaTeX-insert-parens-region map) (YaTeX-define-key "s" 'yahtml-insert-form map) (YaTeX-define-key "l" 'yahtml-insert-tag map) + (YaTeX-define-key "L" 'yahtml-insert-tag-region map) (YaTeX-define-key "m" 'yahtml-insert-single map) - (YaTeX-define-key "n" '(lambda () (interactive) (if yahtml-prefer-upcases (insert "<BR>")(insert "<br>"))) map) + (YaTeX-define-key "n" '(lambda () (interactive) (insert (if yahtml-prefer-upcases "<BR>" "<br>"))) map) + (YaTeX-define-key "-" '(lambda () (interactive) (insert (if yahtml-prefer-upcases "<HR>" "<hr>") "\n")) map) (if YaTeX-no-begend-shortcut (progn (YaTeX-define-key "B" 'yahtml-insert-begend-region map) @@ -188,11 +190,11 @@ (defvar yahtml-paragraph-start (concat - "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|d[ldt]\\|[bhtd][rdh]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\)\\b") + "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|d[ldt]\\|[bhtd][rdh]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\|blockquote\\)\\b") "*Regexp of html paragraph separater") (defvar yahtml-paragraph-separate (concat - "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|[bhtd][ldt]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\|!--\\)\\b") + "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|[bhtd][ldt]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\|blockquote\\|!--\\)\\b") "*Regexp of html paragraph separater") (defvar yahtml-syntax-table nil "*Syntax table for typesetting buffer") @@ -200,8 +202,8 @@ (if yahtml-syntax-table nil (setq yahtml-syntax-table (make-syntax-table (standard-syntax-table))) - (modify-syntax-entry ?\< "(" yahtml-syntax-table) - (modify-syntax-entry ?\> ")" yahtml-syntax-table) + (modify-syntax-entry ?\< "(>" yahtml-syntax-table) + (modify-syntax-entry ?\> ")<" yahtml-syntax-table) (modify-syntax-entry ?\n " " yahtml-syntax-table) ) (defvar yahtml-command-regexp "[A-Za-z0-9]+" @@ -221,7 +223,8 @@ ("DefinitionList" . "dl") ("Preformatted" . "pre") ("table") ("tr") ("th") ("td") - ("h1") ("h2") ("h3") ("h4") ("h5") ("h6"))) + ("h1") ("h2") ("h3") ("h4") ("h5") ("h6") + ("p"))) (defvar yahtml-itemizing-regexp "\\(ul\\|ul\\|dl\\)" @@ -258,9 +261,14 @@ (defvar yahtml-prefer-upcases nil) +;(defvar yahtml-struct-name-regexp +; "\\<\\(h[1-6]\\|[uod]l\\|html\\|body\\|title\\|head\\|table\\|t[rhd]\\|pre\\|a\\|form\\|select\\|center\\|blockquote\\)\\b") (defvar yahtml-struct-name-regexp - "\\<\\(h[1-6]\\|[uod]l\\|html\\|body\\|title\\|head\\|table\\|t[rhd]\\|pre\\|a\\|form\\|select\\)\\b") - + (concat + "\\<\\(" + (mapconcat (function (lambda (x) (car x))) yahtml-typeface-table "\\|") + "\\)\\b") + "Regexp of structure beginning.") (defun yahtml-mode () (interactive) @@ -610,7 +618,7 @@ "\""))))) (defvar yahtml-parameters-completion-alist - '(("align" ("top") ("middle") ("bottom")) + '(("align" ("top") ("middle") ("bottom") ("left") ("right") ("center")) ("src" . file) ("method" ("POST") ("GET")))) @@ -665,6 +673,12 @@ (defun yahtml:dt () (setq yahtml-last-single-cmd "dd") "") +(defun yahtml:p () + (let ((alg (yahtml-read-parameter "align"))) + (if (string< "" alg) + (setq alg (concat "align=" alg) + alg (if yahtml-prefer-upcases (upcase alg) (downcase alg))) + ""))) (defvar yahtml-input-types '(("text") ("password") ("checkbox") ("radio") ("submit") @@ -736,6 +750,11 @@ (insert (format "<%s%s>" tag (yahtml-addin tag))) (save-excursion (insert (format "</%s>" tag))))) +(defun yahtml-insert-tag-region (&optional tag) + "Call yahtml-insert-tag with region mode." + (interactive) + (yahtml-insert-tag t tag)) + (defun yahtml-insert-single (cmd) "Insert <CMD>." (interactive @@ -1158,7 +1177,7 @@ (defun yahtml-fill-paragraph (arg) (interactive "P") (let*((case-fold-search t) (p (point)) - (e (or (yahtml-inner-environment-but "^a\\b" t) "html")) + (e (or (yahtml-inner-environment-but "^\\(a\\|p\\)\\b" t) "html")) (prep (string-match "^pre$" e)) (ps1 (if prep (default-value 'paragraph-start) paragraph-start)) @@ -1195,12 +1214,13 @@ ;;; (defun yahtml-indent-line () (interactive) - (let ((envs "[uod]l\\|table\\|t[rhd]\\|select") - (itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)>") + (let ((envs "[uod]l\\|table\\|t[rhd]\\|select\\|blockquote") + (itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)\\b") inenv p col peol (case-fold-search t)) (save-excursion (beginning-of-line) - (setq inenv (or (yahtml-inner-environment-but "^a\\b" t) "html") + (setq inenv (or (yahtml-inner-environment-but "^\\(a\\|p\\)\\b" t) + "html") col (get 'YaTeX-inner-environment 'indent) p (get 'YaTeX-inner-environment 'point) op)) @@ -1224,7 +1244,9 @@ (setq op (point)) (goto-char p) (re-search-forward itms op t) - (goto-char (match-end 0)) + ;(goto-char (match-end 0)) + (skip-chars-forward "^>") + (skip-chars-forward ">") (skip-chars-forward " \t") (setq col (current-column))))) (YaTeX-reindent col))
--- a/yatex.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatex.el Mon Apr 07 20:07:48 1997 +0000 @@ -1,8 +1,8 @@ ;;; -*- Emacs-Lisp -*- ;;; Yet Another tex-mode for emacs. -;;; yatex.el rev. 1.63 +;;; yatex.el rev. 1.64 ;;; (c )1991-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp] -;;; Last modified Fri Jan 24 17:57:14 1997 on supra +;;; Last modified Tue Apr 8 05:07:31 1997 on crx ;;; $Id$ ;; This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. (require 'comment) -(defconst YaTeX-revision-number "1.63" +(defconst YaTeX-revision-number "1.64" "Revision number of running yatex.el" ) @@ -478,6 +478,9 @@ ;(suppress-keymap YaTeX-typesetting-mode-map t) (define-key YaTeX-typesetting-mode-map " " 'YaTeX-jump-error-line) (define-key YaTeX-typesetting-mode-map "\C-m" 'YaTeX-send-string) + (define-key YaTeX-typesetting-mode-map "1" 'delete-other-windows) + (define-key YaTeX-typesetting-mode-map "0" 'delete-window) + (define-key YaTeX-typesetting-mode-map "q" 'delete-window) ) (defvar YaTeX-section-completion-map nil @@ -725,6 +728,8 @@ ;;autoload from yatexhie.el (autoload 'YaTeX-display-hierarchy "yatexhie" "YaTeX document hierarchy browser" t) +(autoload 'YaTeX-display-hierarchy-directly "yatexhie" + "Same as YaTeX-display-hierarchy. Call from mouse." t) ;; autoload from yahtml.el (autoload 'yahtml-inner-environment-but "yahtml" "yahtml internal func." t) @@ -1627,7 +1632,7 @@ '(("\\\\epsfile{[^},]*file=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 1) ("\\\\epsfig{[^},]*fi\\(le\\|gure\\)=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 2) ("\\\\postscriptbox{[^}]*}{[^}]*}{\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 1) - ("\\\\\\(epsfbox\\|includegraphics\\){\\(\\([^,} ]*/\\)?[^} ]+\\)\\(\\.e?ps\\)?}" 2) + ("\\\\\\(epsfbox\\|includegraphics\\){\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 2) ("\\\\\\(psbox\\)\\(\\[[^]]+\\]\\)?{\\(\\([^,} ]*/\\)?[^} ]+\\)\\(\\.e?ps\\)}" 3) ;\psbox[options...]{hoge.eps} (97/1/11) ) "See the documentation of YaTeX-processed-file-regexp-alist." @@ -1820,8 +1825,8 @@ (cond ((YaTeX-goto-corresponding-label arg)) ((YaTeX-goto-corresponding-environment)) + ((YaTeX-goto-corresponding-file-processor arg)) ((YaTeX-goto-corresponding-file arg)) - ((YaTeX-goto-corresponding-file-processor arg)) ((YaTeX-goto-corresponding-BEGIN-END)) ((and (string-match YaTeX-equation-env-regexp ;to delay loading @@ -1962,7 +1967,7 @@ ;;append `^%' to head of paragraph delimiter. (paragraph-start (concat - "^$\\|^%\\(" YaTeX-paragraph-delimiter "\\)")) + "^$\\|^%\\(" YaTeX-paragraph-separate "\\)")) (paragraph-separate paragraph-start)) (mark-paragraph) (if (not (bobp)) (forward-line 1)) @@ -2533,7 +2538,7 @@ (progn (setq p (point)) (insert YaTeX-comment-prefix))) (forward-line 1)) (goto-char p) - (delete-char 1) ;remove last inserted `%' + (if (looking-at "%") (delete-char 1)) ;remove last inserted `%' ))))))) ) @@ -2556,7 +2561,8 @@ ; (string-match ; "^[Pp][Rr][Ee]" (yahtml-inner-environment-but "^[Aa]\\b" t))) ; (yahtml-indent-new-commnet-line)) - ((YaTeX-in-math-mode-p) nil) ;1996/12/30 + ((and (eq major-mode 'yatex-mode) ;1997/2/4 + (YaTeX-in-math-mode-p)) nil) ;1996/12/30 (t (let (fill-prefix) (apply 'YaTeX-saved-indent-new-comment-line (if soft (list soft)))))) )
--- a/yatex.new Fri Jan 24 09:04:06 1997 +0000 +++ b/yatex.new Mon Apr 07 20:07:48 1997 +0000 @@ -1,6 +1,13 @@ What's new in YaTeX 野鳥/yahtml - 各バージョンの変更点について +1.64 yahtmlを起動するとYaTeXで [prefix] Bc が<center>などになってしま + うのを修正。 + NTT-jTeX が t のときにfillがうまく行かないことがあるのを修正。 + YaTeX-uncomment-paragraph を修正。 + yahtmlで文章中に$があるとauto-indentが効かなくなるのを修正。 + yatexで\end行でIntelligent newlineした時のバグを修正。 + 1.63 数式モードに入ったら漢字モードをOFFにするようにした(本来1.62) yahtmlで [prefix] t j で(j)weblintを呼ぶようにした。 yahtmlのブラウザ起動は、[prefix] t p に変更。
--- a/yatex19.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatex19.el Mon Apr 07 20:07:48 1997 +0000 @@ -1,7 +1,7 @@ ;;; -*- Emacs-Lisp -*- ;;; YaTeX facilities for Emacs 19 ;;; (c )1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp] -;;; Last modified Fri Jan 24 18:00:49 1997 on supra +;;; Last modified Fri Feb 14 13:52:54 1997 on supra ;;; $Id$ ;;; とりあえず hilit19 を使っている時に色が付くようにして @@ -297,6 +297,14 @@ (YaTeX-19-region-section-type "\\\\caption\\(\\[[^]]*\\]\\)?{" label) + ;; things that do some sort of cross-reference + (YaTeX-19-region-section-type + "\\\\\\(\\(no\\)?cite\\|\\(page\\)?ref\\|label\\|index\\|glossary\\){" + crossref) + + ;; things that bring in external files + ("\\\\\\(include\\|input\\|bibliography\\){" "}" include) + ;; formulas ("[^\\]\\\\(" "\\\\)" formula) ; \( \) ("[^\\]\\\\\\[" "\\\\\\]" formula) ; \[ \] @@ -305,21 +313,13 @@ formula) ("[^\\$]\\($\\($[^$]*\\$\\|[^$]*\\)\\$\\)" 1 formula); '$...$' or '$$...$$' - ;; things that bring in external files - ("\\\\\\(include\\|input\\|bibliography\\){" "}" include) - - ;; "wysiwyg" emphasis -- these don't work with nested expressions + ;; "wysiwyg" emphasis -- these don't work on nested expressions (YaTeX-19-region-large-type "{\\\\\\(em\\|it\\|sl\\)" italic) (YaTeX-19-region-large-type "{\\\\bf" bold) ;;;(YaTeX-19-region-large-type "{\\\\tt" tt) ;;;("\\\\begin{verbatim" "\\\\end{verbatim" tt) - ("``" "''" string) - - ;; things that do some sort of cross-reference - (YaTeX-19-region-section-type - "\\\\\\(\\(no\\)?cite\\|\\(page\\)?ref\\|label\\|index\\|glossary\\){" - crossref)) + ("``" "''" string)) "*Hiliting pattern alist for LaTeX text.") ;;(defvar YaTeX-hilit-pattern-adjustment-default nil)
--- a/yatexenv.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatexenv.el Mon Apr 07 20:07:48 1997 +0000 @@ -2,7 +2,7 @@ ;;; YaTeX environment-specific functions. ;;; yatexenv.el ;;; (c ) 1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp] -;;; Last modified Fri Jan 24 18:00:38 1997 on supra +;;; Last modified Mon Apr 7 15:19:05 1997 on crx ;;; $Id$ ;;; @@ -199,8 +199,9 @@ `\\> \\> \\' for tabbing environemnt, `& & \\ \hline' for tabular environment." (interactive "P") - (let*((env (YaTeX-inner-environment)) - func) + (let*(env func) + (end-of-line) + (setq env (YaTeX-inner-environment)) (if arg (setq env (YaTeX-read-environment "For what environment? "))) (setq func (intern-soft (concat "YaTeX-intelligent-newline-" env))) (end-of-line)
--- a/yatexhks.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatexhks.el Mon Apr 07 20:07:48 1997 +0000 @@ -10,6 +10,9 @@ ;Private definitions begin from here. +;;97/1/27 +(define-key YaTeX-user-extensional-map "v" 'YaTeX-section-overview) +;;initial version (define-key YaTeX-user-extensional-map "0" '(lambda () (interactive) (YaTeX-make-section nil nil nil "part"))) (define-key YaTeX-user-extensional-map "1"
--- a/yatexprc.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatexprc.el Mon Apr 07 20:07:48 1997 +0000 @@ -2,7 +2,7 @@ ;;; YaTeX process handler. ;;; yatexprc.el ;;; (c )1993-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp] -;;; Last modified Fri Jan 24 17:59:44 1997 on supra +;;; Last modified Mon Jan 27 10:22:06 1997 on crx ;;; $Id$ (require 'yatex) @@ -390,7 +390,7 @@ (send-string-to-terminal "\e[2J\e[>5h") ;CLS & hide cursor (call-process shell-file-name "con" "*dvi-preview*" nil YaTeX-shell-command-option - (concat preview-command preview-file)) + (concat preview-command " " preview-file)) (send-string-to-terminal "\e[>5l") ;show cursor (redraw-display)) (t ;if UNIX
--- a/yatexsec.el Fri Jan 24 09:04:06 1997 +0000 +++ b/yatexsec.el Mon Apr 07 20:07:48 1997 +0000 @@ -2,7 +2,7 @@ ;;; YaTeX sectioning browser. ;;; yatexsec.el ;;; (c ) 1994 by HIROSE Yuuji [yuuji@ae.keio.ac.jp] -;;; Last modified Thu Jan 11 01:07:53 1996 on VFR +;;; Last modified Mon Feb 17 11:26:44 1997 on supra ;;; $Id$ (defvar YaTeX-sectioning-level @@ -86,6 +86,7 @@ (define-key YaTeX-sectioning-buffer-map "o" 'other-window) (define-key YaTeX-sectioning-buffer-map "-" 'shrink-window) (define-key YaTeX-sectioning-buffer-map "+" 'enlarge-window) + (define-key YaTeX-sectioning-buffer-map "q" 'delete-window) (define-key YaTeX-sectioning-buffer-map "\C-_" 'YaTeX-shift-section-undo) (and YaTeX-emacs-19 (boundp 'window-system) (eq window-system 'x) (define-key YaTeX-sectioning-buffer-map [?\C-/]
