."
(interactive
@@ -773,6 +916,14 @@
yahtml-last-single-cmd))
(insert (format "<%s>" cmd)))
+(defun yahtml-insert-p (&optional arg)
+ "Convenient function to insert "
+ (interactive "P")
+ (if arg (yahtml-insert-tag nil "p")
+ (insert "")
+ (save-excursion
+ (insert "
"))))
+
;;; ---------- Jump ----------
(defun yahtml-on-href-p ()
"Check if point is on href clause."
@@ -785,8 +936,9 @@
(goto-char (get 'YaTeX-inner-environment 'point))
(search-forward "href" e t)
(search-forward "=" e t)
- (skip-chars-forward " \t\n")
- (looking-at "\"?\\([^\"> \t\n]+\\)\"?")
+ (progn
+ (skip-chars-forward " \t\n")
+ (looking-at "\"?\\([^\"> \t\n]+\\)\"?"))
(< p (match-end 0))
(YaTeX-match-string 1)
))))
@@ -816,6 +968,16 @@
"Call WWW Browser to see HREF."
(let ((pb "* WWW Browser *") (cb (current-buffer)))
(cond
+ ((string-match "^start\\>" yahtml-www-browser)
+ (if (get-buffer pb)
+ (progn (set-buffer pb) (erase-buffer) (set-buffer cb)))
+ (put 'yahtml-netscape-sentinel 'url href)
+ (set-process-sentinel
+ (setq yahtml-browser-process
+ (start-process
+ "browser" pb shell-file-name yahtml-shell-command-option
+ (format "%s \"%s\"" yahtml-www-browser href)))
+ 'yahtml-netscape-sentinel))
((and (string-match "[Nn]etscape" yahtml-www-browser)
(not (eq system-type 'windows-nt)))
(if (get-buffer pb)
@@ -843,7 +1005,7 @@
(defun yahtml-goto-corresponding-href (&optional other)
"Go to corresponding name."
- (let ((href (yahtml-on-href-p)) file name)
+ (let ((href (yahtml-on-href-p)) file name (parent buffer-file-name))
(if href
(cond
((string-match "^\\(ht\\|f\\)tp:" href)
@@ -858,7 +1020,8 @@
(if (string-match "^/" file)
(setq file (yahtml-url-to-path file)))
(if other (YaTeX-switch-to-buffer-other-window file)
- (YaTeX-switch-to-buffer file))))
+ (YaTeX-switch-to-buffer file))
+ (or YaTeX-parent-file (setq YaTeX-parent-file parent))))
(if name
(progn (set-mark-command nil) (yahtml-jump-to-name name)))
t)))))
@@ -954,6 +1117,7 @@
((yahtml-goto-corresponding-href other))
((yahtml-goto-corresponding-img))
((yahtml-goto-corresponding-begend))
+ (t (message "I don't know where to go."))
))
(defun yahtml-goto-corresponding-*-other-window ()
@@ -961,27 +1125,54 @@
(interactive)
(yahtml-goto-corresponding-* t))
+(defun yahtml-visit-main ()
+ "Go to parent file from where you visit current file."
+ (interactive)
+ (if YaTeX-parent-file (YaTeX-switch-to-buffer YaTeX-parent-file)))
+
;;; ---------- killing ----------
(defun yahtml-kill-begend (&optional whole)
- (let ((tag (yahtml-on-begend-p)) (p (make-marker)) (q (make-marker)))
+ (let ((tag (yahtml-on-begend-p)) p q r)
(if tag
- (progn
+ (save-excursion
(or (looking-at "<")
(progn (skip-chars-backward "^<") (forward-char -1)))
- (set-marker p (point))
+ (setq p (point))
(yahtml-goto-corresponding-begend)
(or (looking-at "<")
(progn (skip-chars-backward "^<") (forward-char -1)))
- (delete-region (point) (progn (forward-list 1) (point)))
- (set-marker q (point))
- (beginning-of-line)
- (if (looking-at "^\\s *$")
- (delete-region (point) (progn (forward-line 1) (point))))
+ (if (< (point) p) ;if on the opening tag
+ (progn (setq q p p (point))
+ (goto-char q))
+ (setq q (point))) ;now q has end-line's (point)
+ (if (not whole)
+ (kill-region
+ (progn (skip-chars-backward " \t") (if (bolp) (point) q))
+ (progn (forward-list 1)
+ (setq r (point))
+ (skip-chars-forward " \t")
+ (if (and (eolp) (not (eobp))) (1+ (point)) r))))
(goto-char p)
- (delete-region (point) (progn (forward-list 1) (point)))
- (if (looking-at "^\\s *$")
- (delete-region (point) (progn (forward-line 1) (point))))
- (if whole (delete-region p q))
+ (skip-chars-backward " \t")
+ (if (not whole)
+ (progn
+ (kill-append
+ (buffer-substring
+ (setq p (if (bolp) (point) p))
+ (setq q (progn
+ (forward-list 1)
+ (setq r (point))
+ (skip-chars-forward " \t")
+ (if (and (eolp) (not (eobp))) (1+ (point)) r))))
+ t)
+ (delete-region p q))
+ (kill-region
+ (if (bolp) (point) p)
+ (progn (goto-char q)
+ (forward-list 1)
+ (setq r (point))
+ (skip-chars-forward " \t")
+ (if (and (eolp) (not (eobp))) (1+ (point)) r))))
tag))))
(defun yahtml-kill-* (whole)
@@ -1024,20 +1215,25 @@
(save-excursion
(and
(re-search-backward "" nil t)
+ (progn
+ (goto-char (match-end 0))
+ (skip-chars-forward " \t\n")
+ (setq b1 (point))
+ (search-forward ">" nil t))
(setq e1 (match-beginning 0))
(goto-char b1)
(re-search-forward "href\\s *=" e1 t)
(>= p (point))
- (goto-char (match-end 0))
- (skip-chars-forward " \t\n")
- (looking-at "\"?\\([^\"> \t\n]+\\)\"?")
+ (progn
+ (goto-char (match-end 0))
+ (skip-chars-forward " \t\n")
+ (looking-at "\"?\\([^\"> \t\n]+\\)\"?"))
(< p (match-end 0)))))
(setq b1 (match-beginning 1) e1 (match-end 1)
yahtml-completing-buffer (current-buffer)
+ ;; yahtml-urls-local is buffer-local, so we must put
+ ;; that into yahtml-urls here
+ yahtml-urls (append yahtml-urls-private yahtml-urls-local)
href (read-from-minibuffer
"Change href to: " "" yahtml-url-completion-map))
(if (string< "" href)
@@ -1123,19 +1319,35 @@
))
;;; ---------- commenting ----------
-(defun yahtml-comment-region (beg end)
- (interactive "r")
- (comment-region beg end nil))
+(defun yahtml-comment-region (&optional uncom)
+ "Comment out region or environment."
+ (interactive)
+ (let (e beg p)
+ (cond
+ ((setq e (yahtml-on-begend-p))
+ (save-excursion
+ (setq p (point))
+ (if (string-match "^/" e)
+ (setq beg (progn (forward-line 1) (point)))
+ (setq beg (progn (beginning-of-line) (point))))
+ (goto-char p)
+ (yahtml-goto-corresponding-begend)
+ (if (string-match "^/" e)
+ (beginning-of-line)
+ (forward-line 1))
+ (comment-region beg (point) (if uncom (list 4)))))
+ (t (comment-region (region-beginning) (region-end)
+ (if uncom (list 4)))))))
-(defun yahtml-uncomment-region (beg end)
- (interactive "r")
- (comment-region beg end '(4)))
+(defun yahtml-uncomment-region ()
+ (interactive)
+ (yahtml-comment-region t))
(defun yahtml-inner-environment-but (exclude &optional quick)
"Return the inner environment but matches with EXCLUDE tag."
- (let (e)
+ (let (e (case-fold-search t))
(save-excursion
(while (and (setq e (YaTeX-inner-environment quick))
(string-match exclude e))
@@ -1192,8 +1404,11 @@
(fill-region-as-paragraph
(progn (re-search-backward paragraph-start nil t)
(or (save-excursion
- (goto-char (match-end 0))
- (skip-chars-forward " \t>")
+ (goto-char (match-beginning 0))
+ (if (looking-at "<")
+ (forward-list)
+ (goto-char (match-end 0))
+ (skip-chars-forward " \t>"))
(if (looking-at "[ \t]*$")
(progn (forward-line 1) (point))))
(point)))
@@ -1213,8 +1428,32 @@
;;; ---------- indentation ----------
;;;
(defun yahtml-indent-line ()
+ "Indent a line (faster wrapper)"
(interactive)
- (let ((envs "[uod]l\\|table\\|t[rhd]\\|select\\|blockquote")
+ (let (indent)
+ (if (and (save-excursion
+ (beginning-of-line) (skip-chars-forward "\t ")
+ (not (looking-at "<")))
+ (save-excursion
+ (forward-line -1)
+ (while (and (not (bobp)) (looking-at "^\\s *$"))
+ (forward-line -1))
+ (skip-chars-forward "\t ")
+ (setq indent (current-column))
+ (not (looking-at "<"))))
+ (progn
+ (save-excursion
+ (beginning-of-line)
+ (skip-chars-forward " \t")
+ (or (= (current-column) indent)
+ (YaTeX-reindent indent)))
+ (and (bolp) (skip-chars-forward " \t")))
+ (yahtml-indent-line-real))))
+
+(defun yahtml-indent-line-real ()
+ (interactive)
+ (let ((envs "[uod]l\\|table\\|[ht][rhd0-6]\\|select\\|blockquote\\|center\\|menu\\|dir")
+ (itemizing-envs "^\\([uod]l\\|menu\\|dir\\)$")
(itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)\\b")
inenv p col peol (case-fold-search t))
(save-excursion
@@ -1223,38 +1462,43 @@
"html")
col (get 'YaTeX-inner-environment 'indent)
p (get 'YaTeX-inner-environment 'point)
- op))
+ op nil))
(save-excursion
(cond
((string-match envs inenv)
(save-excursion
(beginning-of-line)
(skip-chars-forward " \t")
- (cond
+ (cond ;lookup current line's tag
((looking-at (concat ""))
(YaTeX-reindent col))
- ((or (looking-at itms)
- (and yahtml-hate-too-deep-indentation
- (looking-at (concat "<" envs))))
+ ((looking-at itms)
(YaTeX-reindent (+ col yahtml-environment-indent)))
+ ((and yahtml-hate-too-deep-indentation
+ (looking-at (concat "<\\(" envs "\\)")))
+ (YaTeX-reindent (+ col (* 2 yahtml-environment-indent))))
((and (< p (point))
+ (string-match itemizing-envs inenv)
(save-excursion
(and
;;(re-search-backward itms p t)
(setq op (point))
(goto-char p)
(re-search-forward itms op t)
- ;(goto-char (match-end 0))
- (skip-chars-forward "^>")
- (skip-chars-forward ">")
- (skip-chars-forward " \t")
- (setq col (current-column)))))
+ (progn
+ (skip-chars-forward "^>")
+ (skip-chars-forward ">")
+ (skip-chars-forward " \t")
+ (setq col (if (looking-at "$")
+ (+ col yahtml-environment-indent)
+ (current-column)))))))
(YaTeX-reindent col))
(t
(YaTeX-reindent (+ col yahtml-environment-indent)))))))
(and (bolp) (skip-chars-forward " \t"))
(if (and (setq inenv (yahtml-on-begend-p))
- (string-match (concat "^\\(" envs "\\)") inenv))
+ (string-match
+ (concat "^\\<\\(" yahtml-struct-name-regexp "\\)") inenv))
(save-excursion
(setq peol (point-end-of-line))
(or (= (char-after (point)) ?<)
@@ -1312,6 +1556,7 @@
(defun yahtml-lint-buffer (buf)
"Call lint on buffer BUF."
+ (require 'yatexprc)
(interactive "bCall lint on buffer: ")
(setq buf (get-buffer buf))
(YaTeX-save-buffers)
@@ -1329,7 +1574,7 @@
(setq file (expand-file-name file)))
(if (string-match "^[A-Za-z]:/" file)
(progn
- ;; (aset file 1 ?|) ;$B$3$l$OMW$i$J$$$i$7$$!D(B
+ ;; (aset file 1 ?|) ;����͗v��Ȃ��炵���c
(setq file (concat "///" file))))
(while list
(if (string-match (concat "^" (regexp-quote (car (car list)))) file)
@@ -1356,15 +1601,16 @@
(if (string-match "\\(http://[^/]*\\)/" url)
(setq docroot (substring url (match-end 1)))
(setq docroot url))
- (if (string-match (concat "^" (regexp-quote docroot)) file)
- (setq realpath
- (expand-file-name
- (substring
- file
- (if (= (aref file (1- (match-end 0))) ?/)
- (match-end 0) ; "/foo"
- (min (1+ (match-end 0)) (length file)))) ; "/~foo"
- (car (car list)))))
+ (cond
+ ((string-match (concat "^" (regexp-quote docroot)) file)
+ (setq realpath
+ (expand-file-name
+ (substring
+ file
+ (if (= (aref file (1- (match-end 0))) ?/)
+ (match-end 0) ; "/foo"
+ (min (1+ (match-end 0)) (length file)))) ; "/~foo"
+ (car (car list))))))
(if realpath
(progn (setq list nil)
(if (and dirsufp (not (string-match "/$" realpath)))
@@ -1406,15 +1652,22 @@
(interactive "P")
(let (env func)
(end-of-line)
- (setq env (downcase (or (YaTeX-inner-environment) "html")))
+ (setq env (downcase (or (yahtml-inner-environment-but "^\\(a\\|p\\)\\b" t)
+ "html")))
(setq func (intern-soft (concat "yahtml-intelligent-newline-" env)))
(newline)
(if (and env func (fboundp func))
- (funcall func))))
+ ;; if intelligent line function is defined, call that
+ (funcall func)
+ ;; else do the default action
+ (if (string-match yahtml-p-prefered-env-regexp env)
+ (yahtml-insert-p)))))
+(defvar yahtml-faithful-to-htmllint nil)
(defun yahtml-intelligent-newline-ul ()
(interactive)
- (insert (if yahtml-prefer-upcases " " " "))
+ (yahtml-insert-single "li")
+ (or yahtml-faithful-to-htmllint (insert " "))
(yahtml-indent-line))
(fset 'yahtml-intelligent-newline-ol 'yahtml-intelligent-newline-ul)
@@ -1427,13 +1680,19 @@
(get 'YaTeX-inner-environment 'point) t))
(cond
((match-beginning 2)
- (insert (if yahtml-prefer-upcases " " " "))
+ (yahtml-insert-single "dd")
+ (or yahtml-faithful-to-htmllint (insert " "))
(setq yahtml-last-single-cmd "dt"))
((match-beginning 3)
- (insert (if yahtml-prefer-upcases " " " "))
+ (yahtml-insert-single "dt")
+ (or yahtml-faithful-to-htmllint (insert " "))
(setq yahtml-last-single-cmd "dd")))
- (insert (if yahtml-prefer-upcases " " " ")))
- (yahtml-indent-line)))
+ (insert (if yahtml-prefer-upcases " " " "))
+ (setq yahtml-last-single-cmd "dd"))
+ (yahtml-indent-line)
+ (and (string-match yahtml-p-prefered-env-regexp "dl")
+ (string-equal yahtml-last-single-cmd "dt")
+ (yahtml-insert-p nil))))
(defun yahtml-intelligent-newline-select ()
(interactive)
@@ -1478,17 +1737,18 @@
(or (get-buffer yahtml-lint-buffer)
(error "No lint program ran."))
(YaTeX-showup-buffer yahtml-lint-buffer nil t)
- (yahtml-jump-to-error-line))
+ (yahtml-jump-to-error-line t))
-(defun yahtml-jump-to-error-line ()
- (interactive)
+(defun yahtml-jump-to-error-line (&optional sit)
+ (interactive "P")
(let ((p (point)) (e (point-end-of-line)))
(end-of-line)
(if (re-search-backward yahtml-error-line-regexp nil t)
(let ((f (YaTeX-match-string 1))
(l (string-to-int (YaTeX-match-string 2))))
+ (if sit (sit-for 1))
(forward-line -1)
- (YaTeX-showup-buffer f nil t)
+ (YaTeX-showup-buffer (YaTeX-switch-to-buffer f t) nil t)
(goto-line l))
(message "No line number usage"))))
@@ -1513,8 +1773,7 @@
("" 0 decl)
("<\\(di\\|dt\\|li\\|dd\\)>" 0 label)
("" crossref)
- ("" 0 decl)
- ("" decl)
))
(defun yahtml-hilit-region-tag (tag)
@@ -1526,13 +1785,19 @@
(progn (re-search-forward (concat "") nil t)
(match-beginning 0))))))
+(defun yahtml-hilit-region-tag-itself (ptn)
+ "Return list of start/end point of itself."
+ (if (re-search-forward ptn nil t)
+ (let ((m0 (match-beginning 0)))
+ (skip-chars-forward "^>")
+ (cons m0 (1+ (point) )))))
+
;(setq hilit-patterns-alist (delq (assq 'yahtml-mode hilit-patterns-alist) hilit-patterns-alist))
-(cond
- ((and (featurep 'hilit19) (featurep 'yatex19))
- (or (assq 'yahtml-mode hilit-patterns-alist)
- (setq hilit-patterns-alist
- (cons (cons 'yahtml-mode yahtml-hilit-patterns-alist)
- hilit-patterns-alist)))))
+(and (featurep 'hilit19)
+ (or (assq 'yahtml-mode hilit-patterns-alist)
+ (setq hilit-patterns-alist
+ (cons (cons 'yahtml-mode yahtml-hilit-patterns-alist)
+ hilit-patterns-alist))))
(provide 'yahtml)
diff --git a/yatex.el b/yatex.el
index 9d35331..533d741 100644
--- a/yatex.el
+++ b/yatex.el
@@ -1,8 +1,8 @@
;;; -*- Emacs-Lisp -*-
;;; Yet Another tex-mode for emacs.
-;;; yatex.el rev. 1.64
+;;; yatex.el rev. 1.65
;;; (c )1991-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Tue Apr 8 05:07:31 1997 on crx
+;;; Last modified Tue Dec 16 22:15:26 1997 on crx
;;; $Id$
;; This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,10 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
(require 'comment)
-(defconst YaTeX-revision-number "1.64"
+(require 'yatexlib)
+(defconst YaTeX-revision-number "1.65"
"Revision number of running yatex.el"
)
-
;---------- Local variables ----------
;;;
;; Initialize local variable for yatex-mode.
@@ -39,9 +39,9 @@
(defvar YaTeX-environment-indent 1
"*Indentation depth at column width in LaTeX environments."
)
-(defvar YaTeX-fill-prefix ""
+(defvar YaTeX-fill-prefix nil
"*fill-prefix used for auto-fill-mode.
-The default value is null string."
+The default value is nil."
)
(defvar YaTeX-fill-column 72
"*fill-column used for auto-fill-mode."
@@ -57,21 +57,12 @@
return to the editing paragraph by calling register-to-point with argument
YaTeX-current-position-register."
)
-(defvar YaTeX-dos (eq system-type 'ms-dos))
-(defvar YaTeX-emacs-19 (string= "19" (substring emacs-version 0 2)))
-(defvar YaTeX-user-completion-table
- (if YaTeX-dos "~/_yatexrc" "~/.yatexrc")
- "*Default filename in which user completion table is saved."
-)
;;(defvar YaTeX-tmp-dic-unit 'main-file
;; "*Default switching unit of temporary dictionary.
;;There are two switching unit:
;;'main-file : switch tmp-dic according to main-file directory.
;;'directory : switch tmp-dic dir by dir."
;;)
-(defvar YaTeX-japan (or (boundp 'NEMACS) (boundp 'MULE))
- "Whether yatex mode is running on Japanese environment or not."
-)
(defvar tex-command (if YaTeX-japan "jlatex" "latex")
"*Default command for typesetting LaTeX text."
)
@@ -134,19 +125,19 @@
"*Kanji coding system latex command types out.
1 = Shift JIS, 2 = JIS, 3 = EUC."
)
-(defvar YaTeX-inhibit-prefix-letter nil
- "*T for changing key definitions from [prefix] Letter to [prefix] C-Letter."
-)
(defvar NTT-jTeX nil
- "*Use NTT-jTeX for latex command."
+ "*T for using NTT-jTeX for latex command.
+More precisely, setting t to this variables inhibits inter-word break on
+typeset document by line-break of source text. That is, YaTeX automatically
+put % after each line at filling.
+���s+�C���f���g�ɂ���āA�^�C�v�Z�b�g��̎��Ԃ��Ă��܂��̂�}������ꍇ��
+t�ɂ���(�Â�NTT-jTeX�Ō����Ɍ����)�B��̓I�ɂ́Afill����Ƃ��Ɋe�s�̏I����
+%��t������B"
)
-(defvar YaTeX-item-regexp (concat (regexp-quote "\\") "\\(sub\\)*item")
+(defvar YaTeX-item-regexp
+ (concat (regexp-quote "\\") "\\(sub\\|bib\\)*item")
"*Regular expression of item command."
)
-(defvar YaTeX-nervous t
- "*If you are nervous about maintenance of yatexrc, set this value to T.
-And you will have the local dictionary."
-)
(defvar YaTeX-sectioning-regexp
"\\(part\\|chapter\\*?\\|\\(sub\\)*\\(section\\|paragraph\\)\\*?\\)\\b"
"*LaTeX sectioning commands regexp."
@@ -182,7 +173,7 @@
Define those environments as a form of list."
)
(defvar YaTeX-itemizing-env-regexp
- "itemize\\|enumerate\\|description\\|list"
+ "itemize\\|enumerate\\|description\\|list\\|thebibliography"
"*Regexp of itemizing environments")
(defvar YaTeX-equation-env-regexp
"array\\*?\\|equation\\*?"
@@ -197,18 +188,9 @@
"*T for removing all continuous commenting character(%).
Nil for removing only one commenting character at the beginning-of-line."
)
-(defvar YaTeX-default-pop-window-height 10
- "Default typesetting buffer height.
-If integer, sets the window-height of typesetting buffer.
-If string, sets the percentage of it.
-If nil, use default pop-to-buffer."
-)
(defvar YaTeX-close-paren-always t
"Close parenthesis always when YaTeX-modify-mode is nil."
)
-(defvar YaTeX-no-begend-shortcut nil
- "*T for disabling shortcut of begin-type completion, [prefix] b d, etc."
-)
(defvar YaTeX-greek-by-maketitle-completion nil
"*T for greek letters completion by maketitle-type completion."
)
@@ -234,22 +216,22 @@
(append YaTeX-math-key-list-private YaTeX-math-key-list-default)
"Key sequence to invoke math-mode's image completion."
)
-(defvar YaTeX-create-file-prefix-g nil
- "*Non-nil creates new file when [prefix] g on \\include{foo}."
-)
(defvar YaTeX-skip-default-reader nil
"Non-nil skips default argument reader of section-type completion."
)
(defvar YaTeX-simple-messages nil
"Non-nil makes minibuffer messages simpler."
)
+(defvar YaTeX-template-file "~/work/template.tex"
+ "*Template TeX source file. This will be inserted to empty file."
+)
(defvar YaTeX-addin-prefix "YaTeX:")
;------------ Completion table ------------
; Set tex-section-like command possible completion
(defvar section-table
'(("part") ("chapter") ("section") ("subsection")
("subsubsection") ("paragraph") ("subparagraph")
- ("author") ("thanks") ("documentstyle") ("pagestyle")
+ ("author") ("thanks") ("documentstyle") ("documentclass") ("pagestyle")
("title") ("underline") ("label") ("makebox")
("footnote") ("footnotetext")
("hspace*") ("vspace*") ("bibliography") ("bibitem") ("cite")
@@ -258,7 +240,8 @@
("setcounter" 2) ("addtocounter" 2) ("stepcounter" 2)
("newcommand" 2) ("renewcommand" 2)
("setcounter" 2) ("newenvironment" 3) ("newtheorem" 2)
- ("cline") ("framebox") ("savebox" 2) ("date") ("put") ("ref")
+ ("cline") ("framebox") ("savebox" 2) ("sbox" 2) ("newsavebox") ("usebox")
+ ("date") ("put") ("ref")
("frac" 2) ("multicolumn" 3) ("shortstack")
)
"Default completion table for section-type completion."
@@ -324,9 +307,6 @@
(defvar YaTeX-mode-map nil
"Keymap used in YaTeX mode"
)
-(defvar YaTeX-typesetting-mode-map nil
- "Keymap used in YaTeX typesetting buffer"
-)
(defvar YaTeX-prefix-map nil
"Keymap used when YaTeX-prefix key pushed"
)
@@ -343,39 +323,6 @@
(defvar YaTeX-math-mode nil
"Holds whether current mode is math-mode."
)
-;---------- Define default key bindings on YaTeX mode map ----------
-(defun YaTeX-define-key (key binding &optional map)
- "Define key on YaTeX-prefix-map."
- (if YaTeX-inhibit-prefix-letter
- (let ((c (aref key 0)))
- (cond
- ((and (>= c ?a) (<= c ?z)) (aset key 0 (1+ (- c ?a))))
- ((and (>= c ?A) (<= c ?Z) (numberp YaTeX-inhibit-prefix-letter))
- (aset key 0 (1+ (- c ?A))))
- (t nil))))
- (define-key (or map YaTeX-prefix-map) key binding)
-)
-(defun YaTeX-define-begend-key-normal (key env &optional map)
- "Define short cut YaTeX-make-begin-end key."
- (YaTeX-define-key
- key
- (list 'lambda '(arg) '(interactive "P")
- (list 'YaTeX-insert-begin-end env 'arg))
- map)
-)
-(defun YaTeX-define-begend-region-key (key env &optional map)
- "Define short cut YaTeX-make-begin-end-region key."
- (YaTeX-define-key key (list 'lambda nil '(interactive)
- (list 'YaTeX-insert-begin-end env t)) map)
-)
-(defun YaTeX-define-begend-key (key env &optional map)
- "Define short cut key for begin type completion both for normal
-and region mode. To customize YaTeX, user should use this function."
- (YaTeX-define-begend-key-normal key env map)
- (if YaTeX-inhibit-prefix-letter nil
- (YaTeX-define-begend-region-key
- (concat (upcase (substring key 0 1)) (substring key 1)) env))
-)
;;;
;; Define key table
;;;
@@ -473,16 +420,6 @@
YaTeX-math-key-list)
)
-(if YaTeX-typesetting-mode-map nil
- (setq YaTeX-typesetting-mode-map (make-keymap))
- ;(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
"*Key map used at YaTeX completion in the minibuffer.")
(if YaTeX-section-completion-map nil
@@ -503,53 +440,34 @@
(setq YaTeX-recursive-map (copy-keymap global-map))
(define-key YaTeX-recursive-map YaTeX-prefix YaTeX-prefix-map))
-;; (define-key YaTeX-recursive-map
-;; (concat YaTeX-prefix (if YaTeX-inhibit-prefix-letter "\C-s" "s"))
-;; 'YaTeX-make-section)
-;; (define-key map
-;; (concat YaTeX-prefix (if YaTeX-inhibit-prefix-letter "\C-m" "m"))
-;; 'YaTeX-make-singlecmd)
-;; (define-key map
-;; (concat YaTeX-prefix (if YaTeX-inhibit-prefix-letter "\C-l" "l"))
-;; 'YaTeX-make-fontsize)
-
-
;---------- Define other variable ----------
(defvar env-name "document" "*Initial tex-environment completion")
(defvar section-name "documentstyle" "*Initial tex-section completion")
(defvar fontsize-name "large" "*Initial fontsize completion")
(defvar single-command "maketitle" "*Initial LaTeX single command")
-(defvar YaTeX-user-table-is-read nil
- "Flag that means whether user completion table has been read or not."
-)
-(defvar YaTeX-kanji-code-alist nil
- "Kanji-code expression translation table."
-)
-(if (boundp 'MULE)
- (setq YaTeX-kanji-code-alist
- (list (cons
- 1
- (if YaTeX-dos (if (boundp '*sjis-dos*) *sjis-dos* *sjis*dos)
- *sjis*))
- '(2 . *junet*) '(3 . *euc-japan*))
-))
(defvar YaTeX-kanji-code (if YaTeX-dos 1 2)
"*File kanji code used by Japanese TeX."
)
(defvar YaTeX-coding-system nil "File coding system used by Japanese TeX.")
-(defvar YaTeX-latex-message-code "Process coding system for LaTeX.")
(cond
+ (YaTeX-emacs-20
+ (setq YaTeX-coding-system
+ (cdr (assoc YaTeX-kanji-code YaTeX-kanji-code-alist))))
((boundp 'MULE)
(setq YaTeX-coding-system
- (symbol-value (cdr (assoc YaTeX-kanji-code YaTeX-kanji-code-alist))))
- (if (not YaTeX-dos)
- (setq YaTeX-latex-message-code *autoconv*)))
+ (symbol-value (cdr (assoc YaTeX-kanji-code YaTeX-kanji-code-alist)))))
((boundp 'NEMACS)
- (setq YaTeX-latex-message-code latex-message-kanji-code))
+ (setq YaTeX-latex-message-code latex-message-kanji-code)))
+
+(defvar YaTeX-mode-syntax-table nil
+ "*Syntax table for yatex-mode")
+
+(if YaTeX-mode-syntax-table nil
+ (setq YaTeX-mode-syntax-table (make-syntax-table (standard-syntax-table)))
+ (modify-syntax-entry ?\< "(>" YaTeX-mode-syntax-table)
+ (modify-syntax-entry ?\> ")<" YaTeX-mode-syntax-table)
+ (modify-syntax-entry ?\n " " YaTeX-mode-syntax-table)
)
-(defvar YaTeX-parent-file nil
- "*Main LaTeX source file name used when %#! expression doesn't exist.")
-(make-variable-buffer-local 'YaTeX-parent-file)
;---------- Provide YaTeX-mode ----------
;;;
@@ -628,6 +546,12 @@
))
(cond ((boundp 'MULE)
(set-file-coding-system YaTeX-coding-system))
+ ((and YaTeX-emacs-20 (fboundp 'coding-system-equal))
+ (or (coding-system-equal
+ YaTeX-coding-system buffer-file-coding-system)
+ (set-buffer-file-coding-system YaTeX-coding-system)))
+ ((featurep 'mule)
+ (set-file-coding-system YaTeX-coding-system))
((boundp 'NEMACS)
(make-local-variable 'kanji-fileio-code)
(setq kanji-fileio-code YaTeX-kanji-code)))
@@ -641,10 +565,14 @@
;;comment-start-skip "[^\\\\]%+[ \t]*"
)
(use-local-map YaTeX-mode-map)
+ (set-syntax-table YaTeX-mode-syntax-table)
(if YaTeX-dos (setq YaTeX-saved-screen-height (screen-height)))
(YaTeX-read-user-completion-table)
(and (fboundp 'YaTeX-19-collect-macros) (YaTeX-19-collect-macros))
(turn-on-auto-fill) ;1.63
+ (and (= 0 (buffer-size)) (file-exists-p YaTeX-template-file)
+ (y-or-n-p (format "Insert %s?" YaTeX-template-file))
+ (insert-file-contents (expand-file-name YaTeX-template-file)))
(run-hooks 'text-mode-hook 'yatex-mode-hook)
)
@@ -653,9 +581,10 @@
(defvar YaTeX-ec-regexp (regexp-quote YaTeX-ec))
(defvar YaTeX-struct-begin
(concat YaTeX-ec "begin{%1}%2")
- "Keyword to begin environment.")
-(defvar YaTeX-struct-end (concat YaTeX-ec "end{%1}")
- "Keyword to end environment.")
+ "Keyword format of begin-environment.")
+(defvar YaTeX-struct-end
+ (concat YaTeX-ec "end{%1}")
+ "Keyword format of end-environment.")
(defvar YaTeX-struct-name-regexp "[^}]+"
"Environment name regexp.")
(defvar YaTeX-TeX-token-regexp
@@ -672,25 +601,6 @@
;;;
;; autoload section
;;;
-;;autoload from yatexlib(general functions).
-(autoload 'YaTeX-showup-buffer "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-window-list "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-search-active-forward "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-search-active-backward "yatexlib" "YaTeX library" t)
-(autoload 'substitute-all-key-definition "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-switch-to-buffer "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-switch-to-buffer-other-window "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-replace-format "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-replace-format-args "yatexlib" "YaTeX library" t)
-(autoload 'rindex "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-match-string "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-minibuffer-complete "yatexlib" "YaTeX library" t)
-(autoload 'goto-buffer-window "yatexlib" "YaTeX library" t)
-(autoload 'split-window-calculate-height "yatexlib" "YaTeX library" t)
-(autoload 'read-string-with-history "yatexlib" "YaTeX library" t)
-(autoload 'read-from-minibuffer-with-history "yatexlib" "YaTeX library" t)
-(autoload 'completing-read-with-history "yatexlib" "YaTeX library" t)
-(autoload 'YaTeX-switch-to-window "yatexlib" "For windows.el" t)
;;autoload from yatexprc.el
(autoload 'YaTeX-visit-main "yatexprc" "Visit main LaTeX file." t)
@@ -782,7 +692,8 @@
(insert "\n")
(or exchange (exchange-point-and-mark)))
(goto-char beg2)
- (YaTeX-intelligent-newline nil))
+ (YaTeX-intelligent-newline nil)
+ (YaTeX-indent-line))
(if YaTeX-current-position-register
(point-to-register YaTeX-current-position-register)))
)
@@ -813,93 +724,6 @@
(YaTeX-make-begin-end t)
)
-(defun YaTeX-inner-environment (&optional quick)
- "Return current inner-most environment.
-Non-nil for optional argument QUICK restricts search bound to most
-recent sectioning command. Matching point is stored to property 'point
-of 'YaTeX-inner-environment, which can be referred by
- (get 'YaTeX-inner-environment 'point)."
- (let*((nest 0)
- (beg (YaTeX-replace-format-args
- (regexp-quote YaTeX-struct-begin)
- YaTeX-struct-name-regexp
- (if (eq major-mode 'yahtml-mode) "\\s *.*" "")
- ""))
- (end (YaTeX-replace-format-args
- (regexp-quote YaTeX-struct-end)
- YaTeX-struct-name-regexp "" ""))
- (begend (concat "\\(" beg "\\)\\|\\(" end "\\)"))
- bound m0
- (open
- (concat "^" (or (cdr (assq major-mode '((yahtml-mode . "<")))) "{")))
- (close
- (concat "^"
- (or (cdr(assq major-mode '((yahtml-mode . "\n\t >")))) "}"))))
- (save-excursion
- (if quick
- (setq bound
- (save-excursion
- (YaTeX-re-search-active-backward
- (concat YaTeX-ec-regexp
- "\\(" YaTeX-sectioning-regexp "\\)\\*?\\{")
- YaTeX-comment-prefix nil 1)
- (or (bobp) (end-of-line))
- (point))))
- (if (catch 'begin
- (if (and (numberp bound) (< (point) bound)) (throw 'begin nil))
- (while (YaTeX-re-search-active-backward
- begend YaTeX-comment-prefix bound t)
- (setq m0 (match-beginning 0))
- (if (looking-at end) ;;(match-beginning 2)
- (setq nest (1+ nest))
- (setq nest (1- nest)))
- (if (< nest 0)
- (progn
- (put 'YaTeX-inner-environment 'point m0)
- (goto-char m0)
- (put 'YaTeX-inner-environment 'indent (current-column))
- (throw 'begin t)))))
- (buffer-substring
- (progn (skip-chars-forward open) (1+ (point)))
- (progn (skip-chars-forward close) (point))))))
-)
-
-(defun YaTeX-end-environment ()
- "Close opening environment"
- (interactive)
- (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 (y-or-n-p
- (concat "Environment `" env
- "' may be already closed. Force close?"))
- nil
- (error "end environment aborted."))))
- (message "") ;Erase (y or n) message.
- (YaTeX-insert-struc 'end env)
- (save-excursion
- (goto-char (or (get 'YaTeX-inner-environment 'point) (match-end 0)))
- (if (pos-visible-in-window-p)
- (sit-for (if YaTeX-dos 2 1))
- (message "Matches with %s at line %d"
- (YaTeX-replace-format-args YaTeX-struct-begin env "" "")
- (count-lines (point-min) (point)))))))
-)
-
-;;;VER2
-(defun YaTeX-insert-struc (what env)
- (cond
- ((eq what 'begin)
- (insert (YaTeX-replace-format-args
- YaTeX-struct-begin env (YaTeX-addin env))))
- ((eq what 'end)
- (insert (YaTeX-replace-format-args YaTeX-struct-end env)))
- (t nil))
-)
-
(defun YaTeX-make-section (arg &optional beg end cmd)
"Make LaTeX \\section{} type command with completing read.
With numeric ARG, you can specify the number of arguments of
@@ -955,7 +779,8 @@
(goto-char (marker-position e)))
(use-global-map YaTeX-recursive-map)
(if (= numarg 0) (YaTeX-make-singlecmd section-name)
- (insert YaTeX-ec section-name (YaTeX-addin section-name)))
+ (progn (insert YaTeX-ec section-name)
+ (insert (YaTeX-addin section-name))))
(while (<= j numarg)
(insert
"{"
@@ -1629,10 +1454,10 @@
")
(defvar YaTeX-processed-file-regexp-alist-default
- '(("\\\\epsfile{[^},]*file=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 1)
+ '(("\\\\epsfile\\(\\[[^]]+\\]\\)?{[^},]*file=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 2)
("\\\\epsfig{[^},]*fi\\(le\\|gure\\)=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 2)
("\\\\postscriptbox{[^}]*}{[^}]*}{\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 1)
- ("\\\\\\(epsfbox\\|includegraphics\\){\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 2)
+ ("\\\\\\(epsfbox\\|includegraphics\\|epsfig\\)\\*?{\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 2) ;\epsfbox{hoge.ps} or \includegraphics{hoge.eps}
("\\\\\\(psbox\\)\\(\\[[^]]+\\]\\)?{\\(\\([^,} ]*/\\)?[^} ]+\\)\\(\\.e?ps\\)}" 3) ;\psbox[options...]{hoge.eps} (97/1/11)
)
"See the documentation of YaTeX-processed-file-regexp-alist."
@@ -1985,34 +1810,55 @@
(if once (end-of-line)))
)
-(defun YaTeX-kill-option-string ()
- (if (and (eq predicate 'YaTeX-on-begin-end-p)
- (looking-at "\\(\\[.*\\]\\)*\\({.*}\\)*"))
- (delete-region (match-beginning 0) (match-end 0)))
-)
-
(defun YaTeX-kill-some-pairs (predicate gofunc kill-contents)
"Kill some matching pair.
-This function assumes that pairs occupy each line where they resid."
- ;;(interactive)
+This function assumes that pairs occupy whole of each line where they resid."
(if (not (funcall predicate)) nil
- (let ((beg (make-marker)) (end (make-marker)) (p (make-marker)))
- (set-marker end (match-end 0))
- (if (match-beginning 2)
- (set-marker beg (match-beginning 2))
- (set-marker beg (match-beginning 1))
- (goto-char (match-end 0))
- (YaTeX-kill-option-string))
+ (let ((b1 (match-beginning 0)) (e1 (match-end 0))
+ b2 e2)
(save-excursion
(funcall gofunc)
- (delete-region (point-beginning-of-line) (match-end 0))
- (YaTeX-kill-option-string)
- (if (and (eolp) (not (eobp))) (delete-char 1))
- (set-marker p (point))
- (goto-char beg)
- (delete-region (point-beginning-of-line) end)
- (if (and (eolp) (not (eobp))) (delete-char 1))
- (if kill-contents (delete-region p (point))))
+ (funcall predicate) ;get match data
+ (if (< (point) e1) ;if currently on begin-line
+ (progn
+ (setq b2 b1 e2 e1
+ b1 (match-beginning 0) e1 (match-end 0))
+ (goto-char e2)) ;goto end-line's end
+ (setq b2 (match-beginning 0)
+ e2 (match-end 0))
+ (goto-char e2)) ;now e2 has surely end-line's end
+ (skip-chars-forward " \t")
+ (and (eolp)
+ (not (eobp))
+ (setq e2 (1+ (point))))
+ (if (not kill-contents)
+ (kill-region
+ (progn
+ (goto-char b2)
+ (skip-chars-backward " \t")
+ (if (bolp) (point) b2))
+ e2))
+ (goto-char b1)
+ (skip-chars-backward " \t")
+ (if (not kill-contents)
+ (progn
+ (kill-append
+ (buffer-substring
+ (setq b1 (if (bolp) (point) b1))
+ (setq e1
+ (progn
+ (goto-char e1)
+ (while (looking-at "{\\| \t")
+ (forward-list 1))
+ (skip-chars-forward " \t")
+ (if (and (eolp) (not (eobp)))
+ (1+ (point))
+ (point)))))
+ t)
+ (delete-region b1 e1))
+ (kill-region
+ (if (bolp) (point) b1)
+ e2)))
t))
)
@@ -2094,7 +1940,9 @@
(require 'yatexsec) ;some case needs this
(if (> (minibuffer-depth) 1)
(error "Too many minibuffer levels for overview."))
- (let ((sw (selected-window))(enable-recursive-minibuffers t) sect)
+ (let ((sw (selected-window))
+ (minibuffer-max-depth nil) ; for XEmacs20
+ (enable-recursive-minibuffers t) sect)
(unwind-protect
(progn
(select-window source-window)
@@ -2622,17 +2470,6 @@
(skip-chars-forward " \t")
(current-column)))
-(defun YaTeX-reindent (col)
- "Remove current indentation and reindento to COL column."
- (save-excursion
- (beginning-of-line)
- (skip-chars-forward " \t")
- (if (/= col (current-column))
- (progn
- (delete-region (point) (progn (beginning-of-line) (point)))
- (indent-to col))))
- (skip-chars-forward " \t" (point-end-of-line)))
-
(defun YaTeX-indent-line ()
"Indent corrent line referrin current environment."
(interactive)
@@ -2706,8 +2543,14 @@
((and (bolp) fill-prefix) (insert fill-prefix))
(t (save-excursion
(beginning-of-line)
- (skip-chars-forward " \t")
- (indent-relative-maybe))
+ (if fill-prefix
+ (progn
+ (delete-region (point)
+ (progn (skip-chars-forward " \t")
+ (point)))
+ (insert fill-prefix))
+ (skip-chars-forward " \t")
+ (indent-relative-maybe)))
(skip-chars-forward " \t")))
;;if current line is \begin, re-indent \end too
(if (and (YaTeX-on-begin-end-p) (match-beginning 1))
@@ -2747,179 +2590,6 @@
(insert YaTeX-comment-prefix))))))
)
-(defun YaTeX-local-table-symbol (symbol)
- "Return the lisp symbol which keeps local completion table of SYMBOL."
- (intern (concat "YaTeX$"
- default-directory
- (symbol-name symbol)))
-)
-
-(defun YaTeX-sync-local-table (symbol)
- "Synchronize local variable SYMBOL.
-Copy its corresponding directory dependent completion table to SYMBOL."
- (if (boundp (YaTeX-local-table-symbol symbol))
- (set symbol (symbol-value (YaTeX-local-table-symbol symbol))))
-)
-
-(defun YaTeX-read-user-completion-table (&optional forcetoread)
- "Append user completion table of LaTeX macros"
- (let*((user-table (expand-file-name YaTeX-user-completion-table))
- (local-table (expand-file-name (file-name-nondirectory user-table)))
- var localvar localbuf (curbuf (current-buffer)) sexp)
- (if YaTeX-user-table-is-read nil
- (message "Loading user completion table")
- (if (file-exists-p user-table) (load-file user-table)
- (message "Welcome to the field of YaTeX. I'm glad to see you!")))
- (setq YaTeX-user-table-is-read t)
- (cond
- ((file-exists-p local-table)
- (set-buffer (setq localbuf (find-file-noselect local-table)))
- (widen)
- (goto-char (point-min))
- (while (re-search-forward "(setq \\([^ ]+\\)" nil t)
- (setq var (intern (buffer-substring
- (match-beginning 1) (match-end 1)))
- localvar (YaTeX-local-table-symbol var))
- (goto-char (match-beginning 0))
- (setq sexp (buffer-substring (point)
- (progn (forward-sexp) (point))))
- (set-buffer curbuf)
- (or (assq var (buffer-local-variables)) (make-local-variable var))
- (eval (read sexp))
- (or (and (boundp localvar)
- (symbol-value localvar)
- (not forcetoread))
- (set localvar (symbol-value var)))
- (set-buffer localbuf))
- (kill-buffer localbuf)))
- (set-buffer curbuf))
-)
-
-(defun YaTeX-reload-dictionary ()
- "Reload local dictionary.
-Use this function after editing ./.yatexrc."
- (interactive)
- (let ((YaTeX-user-table-is-read nil))
- (YaTeX-read-user-completion-table t))
-)
-
-(defun YaTeX-lookup-table (word type)
- "Lookup WORD in completion table whose type is TYPE.
-This function refers the symbol tmp-TYPE-table, user-TYPE-table, TYPE-table.
-Typically, TYPE is one of 'env, 'section, 'fontsize, 'singlecmd."
- (if (symbolp type) (setq type (symbol-name type)))
- (or (assoc word (symbol-value (intern (concat "tmp-" type "-table"))))
- (assoc word (symbol-value (intern (concat "user-" type "-table"))))
- (assoc word (symbol-value (intern (concat type "-table"))))))
-
-(defun YaTeX-update-table (vallist default-table user-table local-table)
- "Update completion table if the car of VALLIST is not in current tables.
-Second argument DEFAULT-TABLE is the quoted symbol of default completion
-table, third argument USER-TABLE is user table which will be saved in
-YaTeX-user-completion-table, fourth argument LOCAL-TABLE should have the
-completion which is valid during current Emacs's session. If you
-want to make LOCAL-TABLE valid longer span (but restrict in this directory)
-create the file in current directory which has the same name with
-YaTeX-user-completion-table."
- (let ((car-v (car vallist)) key answer
- (file (file-name-nondirectory YaTeX-user-completion-table)))
- (cond
- ((assoc car-v (symbol-value default-table))
- nil) ;Nothing to do
- ((setq key (assoc car-v (symbol-value user-table)))
- (if (equal (cdr vallist) (cdr key)) nil
- ;; if association hits, but contents differ.
- (message
- "%s's attributes turned into %s" (car vallist) (cdr vallist))
- (set user-table (delq key (symbol-value user-table)))
- (set user-table (cons vallist (symbol-value user-table)))
- (YaTeX-update-dictionary
- YaTeX-user-completion-table user-table "user")))
- ((setq key (assoc car-v (symbol-value local-table)))
- (if (equal (cdr vallist) (cdr key)) nil
- (message
- "%s's attributes turned into %s" (car vallist) (cdr vallist))
- (set local-table (delq key (symbol-value local-table)))
- (set local-table (cons vallist (symbol-value local-table)))
- (set (YaTeX-local-table-symbol local-table) (symbol-value local-table))
- (YaTeX-update-dictionary file local-table)))
- ;; All of above cases, there are some completion in tables.
- ;; Then update tables.
- (t
- (if (not YaTeX-nervous)
- (setq answer "u")
- (message
- "`%s' is not in table. Register into: U)serDic L)ocalDic N)one D)iscard"
- (car vallist))
- (setq answer (char-to-string (read-char))))
- (cond
- ((string-match answer "uy")
- (set user-table (cons vallist (symbol-value user-table)))
- (YaTeX-update-dictionary YaTeX-user-completion-table user-table "user")
- )
- ((string-match answer "tl")
- (set local-table (cons vallist (symbol-value local-table)))
- (set (YaTeX-local-table-symbol local-table) (symbol-value local-table))
- (YaTeX-update-dictionary file local-table))
- ((string-match answer "d") nil) ;discard it
- (t (set default-table
- (cons vallist (symbol-value default-table))))))))
-)
-
-(defun YaTeX-cplread-with-learning
- (prom default-table user-table local-table
- &optional pred reqmatch init hsym)
- "Completing read with learning.
-Do a completing read with prompt PROM. Completion table is what
-DEFAULT-TABLE, USER-TABLE, LOCAL table are appended in reverse order.
-Note that these tables are passed by the symbol.
-Optional arguments PRED, REQMATH and INIT are passed to completing-read
-as its arguments PREDICATE, REQUIRE-MATCH and INITIAL-INPUT respectively.
-If optional 8th argument HSYM, history symbol, is passed, use it as
-history list variable."
- (YaTeX-sync-local-table local-table)
- (let*((table (append (symbol-value local-table)
- (symbol-value user-table)
- (symbol-value default-table)))
- (word (completing-read-with-history
- prom table pred reqmatch init hsym)))
- (if (and (string< "" word) (not (assoc word table)))
- (YaTeX-update-table (list word) default-table user-table local-table))
- word)
-)
-
-(defun YaTeX-update-dictionary (file symbol &optional type)
- (let ((local-table-buf (find-file-noselect file))
- (name (symbol-name symbol))
- (value (symbol-value symbol)))
- (save-excursion
- (message "Updating %s dictionary..." (or type "local"))
- (set-buffer local-table-buf)
- (goto-char (point-max))
- (search-backward (concat "(setq " name) nil t)
- (delete-region (point) (progn (forward-sexp) (point)))
- (delete-blank-lines)
- (insert "(setq " name " '(\n")
- (mapcar '(lambda (s)
- (insert (format "%s\n" (prin1-to-string s))))
- value)
- (insert "))\n\n")
- (delete-blank-lines)
- (basic-save-buffer)
- (kill-buffer local-table-buf)
- (message "Updating %s dictionary...Done" (or type "local"))))
-)
-
-;; --------------- General sub functions ---------------
-(defun point-beginning-of-line ()
- (save-excursion (beginning-of-line)(point))
-)
-
-(defun point-end-of-line ()
- (save-excursion (end-of-line)(point))
-)
-
-
(provide 'yatex)
(defvar yatex-mode-load-hook nil
"*List of functions to be called when yatex.el is loaded.")
diff --git a/yatex.new b/yatex.new
index 62dc2f5..5e7042d 100644
--- a/yatex.new
+++ b/yatex.new
@@ -1,6 +1,27 @@
What's new in YaTeX
�쒹/yahtml - �e�o�[�W�����̕ύX�_�ɂ���
+1.65 yahtml�̂��C�����s�̃o�O�t�B�N�X�B
+ a, body, img �^�O�̃I�v�V�����������̓A�h�C���̋����B
+ section�^�}�N���̑����������s�ɂ���ĕ��f����Ă��Ă�������
+ hilit����悤�ɂ����B
+ yahtml�̍s�C���f���g���̍������B�J�����g�s���^�O�Ŏn�܂�Ȃ���
+ ���͒��O�̔��s�̃C���f���g��^������悤�ɂ����B����p���邩���B
+ thebibliography����itemize�n�C���f���g�������Ă��Ȃ������̂��C���B
+ GNU Emacs 20 �Ή�(by�|������&me)�B
+ XEmacs 20 �Ή��B
+ yahtml�p�b�P�[�W�̓Ɨ��������B
+ [prefix] k �Ŋ����������Ƃ���kill-ring�ɒlj�����悤�ɂ����B
+ yahtml-hate-too-deep-indentation ��t�̂Ƃ��ɃC���f���g���Ȃ�
+ ������̂��C���B
+ href �⊮�� http:// �q�X�g���� .mosaic-global-history �������
+ ��p�~���A���[�U�����ɓo�^����悤�ɂ����B
+ yahtml�� [prefix] p �� ���o��悤�ɂ����B
+ yahtml�̂��܂������s�ŁAyahtml-p-prefered-env-regexp �Ƀ}�b�`��
+ ��^�O�����̂Ƃ����������}������悤�ɂ����B
+ YaTeX-fill-prefix, yahtml-fill-prefix(�V��)�̃f�t�H���g��nil�ɁB
+ YaTeX-template-file, yahtml-template-file ��V�K�t�@�C���ɑ}���B
+
1.64 yahtml���N�������YaTeX�� [prefix] Bc ���ȂǂɂȂ��Ă���
���̂��C���B
NTT-jTeX �� t �̂Ƃ���fill�����܂��s���Ȃ����Ƃ�����̂��C���B
@@ -20,14 +41,14 @@
\�̂��Ƃ�{����ꂽ�Ƃ���\}������悤�ɂ����B
yahtml�Ńu���E�U��IE���w�肵���Ƃ��̕s����C���B
-1.62 \ref �̈�������s�ɓn�鎞�s����%��t����悤�ɂ���
- yahtml�ł��܂������s���s�K�v�ɋN������̂��C��
- href �̕⊮������� # ���܂܂�鎞�� name ��⊮
+1.62 \ref �̈�������s�ɓn�鎞�s����%��t����悤�ɂ����B
+ yahtml�ł��܂������s���s�K�v�ɋN������̂��C���B
+ href �̕⊮������� # ���܂܂�鎞�� name ��⊮�B
\epsfile{file=foo.eps} �Ȃǂ� [prefix] g �����ꍇ�Afoo.eps�̌��G
- ��ҏW���Ă��邨�G�����\�t�g���N������悤�ɂ���
- yahtml�� [prefix] a �� < �Ȃǂ�����悤�ɂ���
- verbatim���� [prefix] g �����܂���Ȃ������̂��C��
- section�̃I�v�V�����������������̐F�Â��������������̂��C��
+ ��ҏW���Ă��邨�G�����\�t�g���N������悤�ɂ����B
+ yahtml�� [prefix] a �� < �Ȃǂ�����悤�ɂ����B
+ verbatim���� [prefix] g �����܂���Ȃ������̂��C���B
+ section�̃I�v�V�����������������̐F�Â��������������̂��C���B
1.61 AMS-LaTeX �Ή�
xdvi -remote �ɂ��T�[�`�ɑΉ� [prefix] t s
diff --git a/yatex19.el b/yatex19.el
index b8cf113..59a7161 100644
--- a/yatex19.el
+++ b/yatex19.el
@@ -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 Feb 14 13:52:54 1997 on supra
+;;; Last modified Sun Dec 14 21:51:14 1997 on firestorm
;;; $Id$
;;; �Ƃ肠���� hilit19 ���g���Ă��鎞�ɐF���t���悤�ɂ���
@@ -9,146 +9,117 @@
;;; ���������N�����j���[�o�[�g����LaTeX�\�[�X�����낤��?
;;; �܂���������K���K�B���̕��ɂ�����ƃR�����g����B
;;; �^���ӂɂ��邯�ǁAhilit19.el �Ή��̕��͌��\�{�C�B
+;;; �Ƃ������Ă邤���� hilit19 ���� obsolete �ɂȂ��Ă��܂����c
-(require 'yatex)
+;(require 'yatex)
-(defun YaTeX-19-define-sub-menu (map vec &rest bindings)
- "Define sub-menu-item in MAP at vector VEC as BINDINGS.
-BINDINGS is a form with optional length: (symbol title binding).
-When you defined menu-bar keymap such like:
- (define-key foo-map [menu-bar foo] (make-sparse-keymap \"foo menu\"))
-and you want to define sub menu for `foo menu' as followings.
- foo -> menu1 (calling function `func1')
- menu2 (doing interactive call `(func2 ...)'
-Call this function like this:
- (YaTeX-19-define-sub-menu foo-map [menu-bar foo]
- '(m1 \"Function 1\" func1)
- '(m2 \"Function 2\" (lambda () (interactive) (func2 ...))))
-where
- `m1' and `m2' are the keymap symbol for sub-menu of `[menu-bar foo].
- `Funtion 1' and `Function 2' are the title strings for sub-menu.
-"
- (let ((i 0) (vec2 (make-vector (1+ (length vec)) nil)))
- (while (< i (length vec))
- (aset vec2 i (aref vec i))
- (setq i (1+ i)))
- (setq bindings (reverse bindings))
- (mapcar
- (function
- (lambda (bind)
- (aset vec2 (1- (length vec2)) (car bind)) ;set menu-symbol
- (define-key map vec2
- (cons (car (cdr bind))
- (car (cdr (cdr bind)))))))
- bindings)))
-
-;; Menu for Typeset relating processes ----------------------------------------
+(defvar YaTeX-mode-menu-map (make-sparse-keymap "YaTeX"))
+(defvar YaTeX-mode-menu-map-process (make-sparse-keymap "Process"))
(define-key YaTeX-mode-map [menu-bar yatex]
- (cons "YaTeX" (make-sparse-keymap "YaTeX")))
-(define-key YaTeX-mode-map [menu-bar yatex process]
- (cons "Process" (make-sparse-keymap "Process")))
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex process]
- '(buffer "LaTeX" (lambda () (interactive) (YaTeX-typeset-menu nil ?j)))
- '(kill "Kill LaTeX" (lambda () (interactive) (YaTeX-typeset-menu nil ?k)))
- '(bibtex "BibTeX" (lambda () (interactive) (YaTeX-typeset-menu nil ?b)))
- '(makeindex "makeindex" (lambda () (interactive) (YaTeX-typeset-menu nil ?i)))
- '(preview "Preview" (lambda () (interactive) (YaTeX-typeset-menu nil ?p)))
- '(lpr "lpr" (lambda () (interactive) (YaTeX-typeset-menu nil ?l)))
- '(lpq "lpq" (lambda () (interactive) (YaTeX-typeset-menu nil ?q)))
-)
+ (cons "YaTeX" YaTeX-mode-menu-map))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map-process
+ (nreverse
+ '((buffer "LaTeX" . (lambda () (interactive) (YaTeX-typeset-menu nil ?j)))
+ (kill "Kill LaTeX" . (lambda () (interactive) (YaTeX-typeset-menu nil ?k)))
+ (bibtex "BibTeX" . (lambda () (interactive) (YaTeX-typeset-menu nil ?b)))
+ (mindex "makeindex" . (lambda () (interactive) (YaTeX-typeset-menu nil ?i)))
+ (preview "Preview" . (lambda () (interactive) (YaTeX-typeset-menu nil ?p)))
+ (lpr "lpr" . (lambda () (interactive) (YaTeX-typeset-menu nil ?l)))
+ (lpq "lpq" . (lambda () (interactive) (YaTeX-typeset-menu nil ?q))))))
+(defvar YaTeX-mode-menu-map-modes (make-sparse-keymap "Modes"))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map-modes
+ (delq nil
+ (nreverse
+ (list
+ (if YaTeX-auto-math-mode nil
+ (cons 'math (cons "Toggle math-mode"
+ '(lambda () (interactive)
+ (YaTeX-switch-mode-menu nil ?t)))))
+ (cons 'mod (cons "Toggle Modify Mode"
+ '(lambda () (interactive)
+ (YaTeX-switch-mode-menu nil ?m))))))))
+(defvar YaTeX-mode-menu-map-percent (make-sparse-keymap "percent"))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map-percent
+ (nreverse
+ '((! "Change LaTeX typesetter(%#!)"
+ . (lambda () (interactive) (YaTeX-%-menu nil nil ?!)))
+ (begend "Set %#BEGIN-%#END on region"
+ . (lambda () (interactive) (YaTeX-%-menu nil nil ?b)))
+ (lpr "Change LPR format"
+ . (lambda () (interactive) (YaTeX-%-menu nil nil ?l))))))
-;; Help for LaTeX ------------------------------------------------------------
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex]
- '(sephelp "--")
- '(help "Help on LaTeX commands" YaTeX-help)
- '(apropos "Apropos on LaTeX commands" YaTeX-apropos))
+(defvar YaTeX-mode-menu-map-jump (make-sparse-keymap "jump"))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map-jump
+ (nreverse
+ '((corres "Goto corersponding position" . YaTeX-goto-corresponding-*)
+ (main "Visit main source"
+ . (lambda () (interactive) (YaTeX-visit-main)))
+ (main-other "Visit main source other window"
+ . YaTeX-visit-main-other-window))))
-;; Switch modes --------------------------------------------------------------
-(define-key YaTeX-mode-map [menu-bar yatex switch]
- (cons "Switching YaTeX's modes" (make-sparse-keymap "modes")))
-(or YaTeX-auto-math-mode
- (define-key YaTeX-mode-map [menu-bar yatex switch math]
- '("Toggle math mode" . (lambda () (interactive)
- (YaTeX-switch-mode-menu nil ?t)))))
-(define-key YaTeX-mode-map [menu-bar yatex switch mod]
- '("Toggle modify mode" . (lambda () (interactive)
- (YaTeX-switch-mode-menu nil ?m))))
+(defvar YaTeX-mode-menu-map-comment (make-sparse-keymap "comment"))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map-comment
+ (nreverse
+ '((comment "Comment region or environment" . YaTeX-comment-region)
+ (uncomment "Unomment region or environment" . YaTeX-uncomment-region)
+ (commentp "Comment paragraph" . YaTeX-comment-paragraph)
+ (uncommentp "Uncomment paragraph" . YaTeX-uncomment-paragraph))))
-;; % menu --------------------------------------------------------------------
-(define-key YaTeX-mode-map [menu-bar yatex percent]
- (cons "Edit %# notation" (make-sparse-keymap "Edit %# notation")))
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex percent]
- '(! "Change LaTeX typesetter(%#!)"
- (lambda () (interactive) (YaTeX-%-menu nil nil ?!)))
- '(begend "Set %#BEGIN-%#END on region"
- (lambda () (interactive) (YaTeX-%-menu nil nil ?b)))
- '(lpr "Change LPR format"
- (lambda () (interactive) (YaTeX-%-menu nil nil ?l))))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map
+ (nreverse
+ (list
+ ;; Change/Kill/Fill -------------------------------------------------------
+ (cons (list 'chg "Change") (cons "Change macros" 'YaTeX-change-*))
+ (cons (list 'kill "Kill") (cons "Kill macros" 'YaTeX-kill-*))
+ (cons (list 'fill "Fill") (cons "Fill \\item" 'YaTeX-fill-item))
+ (cons (list 'nl "Newline") (cons "Newline" 'YaTeX-intelligent-newline))
+ ;; ========================================================================
+ (cons (list 'sep1 "---") (cons "---" nil))
+ ;; Comment/Uncomment ------------------------------------------------------
+ (cons (list 'comment "comment") (cons "Comment region or environment"
+ 'YaTeX-comment-region))
+ (cons (list 'uncomment "uncomment") (cons "Uncomment region or environment"
+ 'YaTeX-uncomment-region))
+ (cons (list 'commentp "commentp") (cons "Comment paragraph"
+ 'YaTeX-comment-paragraph))
+ (cons (list 'uncommentp "uncommentp") (cons "Uncomment paragraph"
+ 'YaTeX-uncomment-paragraph))
+ ;; ========================================================================
+ (cons (list 'sep2 "---") (cons "---" nil))
+ ;; Jump cursor ------------------------------------------------------------
+ (cons (list 'jump "jump") (cons "Jump Cursor" YaTeX-mode-menu-map-jump))
+ ;; Document hierarchy ---------------------------------------------------
+ (cons (list 'hier "hier") (cons "Display Document hierarchy"
+ 'YaTeX-display-hierarchy))
+ ;; What position ----------------------------------------------------------
+ (cons (list 'col "column") (cons "What column in tabular"
+ 'YaTeX-what-column))
+ ;; % menu -----------------------------------------------------------------
+ (cons (list 'percent "percent") (cons "Edit %# notation"
+ YaTeX-mode-menu-map-percent))
+ ;; Switch modes -----------------------------------------------------------
+ (cons (list 'mode "mode") (cons "Switching YaTeX's modes"
+ YaTeX-mode-menu-map-modes))
+ ;; ========================================================================
+ (cons (list 'sep "---") (cons "---" nil))
+ ;; Help for LaTeX ---------------------------------------------------------
+ (cons (list 'ap "apr") (cons "Apropos on LaTeX commands" 'YaTeX-apropos))
+ (cons (list 'help "help") (cons "Help on LaTeX commands" 'YaTeX-help))
+ ;; Menu for Typeset relating processes ------------------------------------
+ (cons (list 'process "Process menu")
+ (cons "Process" YaTeX-mode-menu-map-process)))
+))
-;; What position -------------------------------------------------------------
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex]
- '(what "What column in tabular" YaTeX-what-column))
-
-;; Document hierarchy ------------------------------------------------------
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex]
- '(hier "Display document hierarchy" YaTeX-display-hierarchy-directly))
-
-;; Jump cursor ---------------------------------------------------------------
-(define-key YaTeX-mode-map [menu-bar yatex jump]
- (cons "Jump cursor"
- (make-sparse-keymap "Jump cursor")))
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex jump]
- '(corres "Goto corersponding position" YaTeX-goto-corresponding-*)
- '(main "Visit main source" (lambda () (interactive) (YaTeX-visit-main)))
- '(main-other "Visit main source other window" YaTeX-visit-main-other-window)
- )
-
-;; ===========================================================================
-(define-key YaTeX-mode-map [menu-bar yatex sepcom]
- '("---" . nil))
-
-;; Comment/Uncomment ---------------------------------------------------------
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex]
- '(comment "Comment region or environment" YaTeX-comment-region)
- '(uncomment "Unomment region or environment" YaTeX-uncomment-region)
- '(commentp "Comment paragraph" YaTeX-comment-paragraph)
- '(uncommentp "Uncomment paragraph" YaTeX-uncomment-paragraph)
- '(sepcom "--" nil)
-)
-
-
-;; ===========================================================================
-;; Change/Kill/Fill
-(YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex]
- '(change "Change macros" YaTeX-change-*)
- '(kill "Kill macros" YaTeX-kill-*)
- '(fillitem "Fill \\item" YaTeX-fill-item)
- '(newline "Newline" YaTeX-intelligent-newline)
- '(sepchg "--" nil)
-)
-
-;; Menu for completions ------------------------------------------------------
-
-
-;;;(YaTeX-19-define-sub-menu
-;;; YaTeX-mode-map [menu-bar yatex]
-;;; '(secr "Section-type command on region" YaTeX-make-section-region)
-;;; '(sec "Section-type command" YaTeX-make-section))
-
-(define-key YaTeX-mode-map [menu-bar yatex sectionr]
- (cons "Section-type region(long name)"
- (make-sparse-keymap "Enclose region with section-type macro")))
-(define-key YaTeX-mode-map [menu-bar yatex section]
- (cons "Section-type(long name)"
- (make-sparse-keymap "Section-type macro")))
+;; Make section-type commands menu -------------------------------------------
+(defvar YaTeX-mode-menu-map-sectionr
+ (make-sparse-keymap "Enclose region with section-type macro"))
+(defvar YaTeX-mode-menu-map-section (make-sparse-keymap "Section-type macro"))
(let ((sorted-section
(sort
(delq nil
@@ -157,56 +128,91 @@
(car s))))
(append section-table user-section-table)))
'string<)))
- (apply 'YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex section]
- (mapcar (function (lambda (secname)
- (list (intern secname) secname
- (list 'lambda ()
- (list 'interactive)
- (list 'YaTeX-make-section
- nil nil nil secname)))))
- sorted-section))
- (apply 'YaTeX-19-define-sub-menu
- YaTeX-mode-map [menu-bar yatex sectionr]
- (mapcar (function (lambda (secname)
- (list (intern secname) secname
- (list 'lambda ()
- (list 'interactive)
- (list 'YaTeX-make-section
- nil
- (list 'region-beginning)
- (list 'region-end)
- secname)))))
- sorted-section)))
+ (YaTeX-define-menu
+ 'YaTeX-mode-menu-map-section
+ (mapcar
+ (function (lambda (secname)
+ (cons (intern secname)
+ (cons secname
+ (list 'lambda ()
+ (list 'interactive)
+ (list 'YaTeX-make-section
+ nil nil nil
+ secname))))))
+ sorted-section))
+ (YaTeX-define-menu
+ 'YaTeX-mode-menu-map-sectionr
+ (mapcar
+ (function (lambda (secname)
+ (cons (intern secname)
+ (cons secname
+ (list 'lambda ()
+ (list 'interactive)
+ (list 'YaTeX-make-section
+ nil
+ (list 'region-beginning)
+ (list 'region-end)
+ secname))))))
+ sorted-section)))
-(define-key YaTeX-mode-map [menu-bar yatex envr]
- (cons "Environment region" (make-sparse-keymap "Environment region")))
-(define-key YaTeX-mode-map [menu-bar yatex env]
- (cons "Environment" (make-sparse-keymap "Environment")))
-(let (prev envname)
- (mapcar
- (function
- (lambda (envalist)
- (setq envname (car envalist))
- (define-key-after
- (lookup-key YaTeX-mode-map [menu-bar yatex env])
- (vector (intern envname))
- (cons envname
- (list 'lambda () (list 'interactive)
- (list 'YaTeX-insert-begin-end
- envname nil)))
- prev)
- (define-key-after
- (lookup-key YaTeX-mode-map [menu-bar yatex envr])
- (vector (intern envname))
- (cons envname
- (list 'lambda () (list 'interactive)
- (list 'YaTeX-insert-begin-end
- envname t)))
- prev)
- (setq prev (intern envname))))
- (sort (append env-table user-env-table)
- '(lambda (x y) (string< (car x) (car y))))))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map
+ (nreverse
+ (list
+ (cons '(sectionr "Section-type (long name)")
+ (cons "Section type" YaTeX-mode-menu-map-section))
+ (cons '(section "Section-type region (long name)")
+ (cons "Section type region (long name)"
+ YaTeX-mode-menu-map-sectionr)))))
+
+;; Make large-type commands menu ---------------------------------------------
+(defvar YaTeX-mode-menu-map-envr (make-sparse-keymap "Environment region"))
+(defvar YaTeX-mode-menu-map-env (make-sparse-keymap "Environment"))
+
+(let ((sorted-env
+ (sort
+ (mapcar (function (lambda (s) (car s)))
+ (append env-table user-env-table))
+ 'string<)))
+ (YaTeX-define-menu
+ 'YaTeX-mode-menu-map-env
+ (mapcar
+ (function (lambda (envname)
+ (cons (intern envname)
+ (cons envname
+ (list 'lambda ()
+ (list 'interactive)
+ (list 'YaTeX-insert-begin-end
+ envname nil))))))
+ sorted-env))
+ (YaTeX-define-menu
+ 'YaTeX-mode-menu-map-envr
+ (mapcar
+ (function (lambda (envname)
+ (cons (intern envname)
+ (cons envname
+ (list 'lambda ()
+ (list 'interactive)
+ (list 'YaTeX-insert-begin-end
+ envname t))))))
+ sorted-env)))
+(YaTeX-define-menu
+ 'YaTeX-mode-menu-map
+ (nreverse
+ (list
+ (cons '(envr "Environment")
+ (cons "Environment" YaTeX-mode-menu-map-env))
+ (cons '(env "Environment region")
+ (cons "Environment region"
+ YaTeX-mode-menu-map-envr)))))
+
+(and (featurep 'xemacs)
+ (add-hook 'yatex-mode-hook
+ '(lambda ()
+ (or (assoc "YaTeX" current-menubar)
+ (progn
+ (set-buffer-menubar (copy-sequence current-menubar))
+ (add-submenu nil YaTeX-mode-menu-map))))))
;; Other key bindings for window-system
;(YaTeX-define-key [?\C- ] 'YaTeX-do-completion)
@@ -225,10 +231,10 @@
"Return list of starting and end point of section-type commands of PATTERN."
(if (re-search-forward pattern nil t)
(let ((m0 (match-beginning 0)) cmd (argc 1))
- (setq cmd (substring (YaTeX-match-string 0) 1 -1)
+ (setq cmd (substring (YaTeX-match-string 0) 1)
argc (or (car (cdr (YaTeX-lookup-table cmd 'section))) argc))
(cons m0
- (progn (skip-chars-backward "^{") (forward-char -2)
+ (progn ;(skip-chars-backward "^{") (forward-char -2)
(while (> argc 0)
(skip-chars-forward "^{")
(forward-list 1)
@@ -264,23 +270,23 @@
;; comments
(YaTeX-19-region-comment "\\([^\\]\\|^\\)\\(%\\).*$" comment)
- (YaTeX-19-region-section-type "\\\\footnote\\(mark\\|text\\)?{" keyword)
+ (YaTeX-19-region-section-type "\\\\footnote\\(mark\\|text\\)?\\>" keyword)
("\\\\[a-z]+box" 0 keyword)
- (YaTeX-19-region-section-type "\\\\\\(v\\|h\\)space\\(\*\\)?{" keyword)
+ (YaTeX-19-region-section-type "\\\\\\(v\\|h\\)space\\>" keyword)
;; (re-)define new commands/environments/counters
(YaTeX-19-region-section-type
- "\\\\\\(re\\)?new\\(environment\\|command\\|theorem\\|length\\|counter\\){"
+ "\\\\\\(re\\)?new\\(environment\\|command\\|theorem\\|length\\|counter\\)\\>"
defun)
(YaTeX-19-region-section-type
- "\\\\textbf{" bold)
+ "\\\\textbf\\>" bold)
;; various declarations/definitions
(YaTeX-19-region-section-type
- "\\\\\\(set\\|setto\\|addto\\)\\(length\\|width\\|counter\\){"
+ "\\\\\\(set\\|setto\\|addto\\)\\(length\\|width\\|counter\\)\\>"
define)
(YaTeX-19-region-section-type
- "\\\\\\(title\\|author\\|date\\|thanks\\){" define)
+ "\\\\\\(title\\|author\\|date\\|thanks\\)\\>" define)
("\\\\document\\(style\\|class\\)\\(\\[.*\\]\\)?{" "}" decl)
("\\\\\\(begin\\|end\\|nofiles\\|includeonly\\){" "}" decl)
@@ -295,11 +301,11 @@
;;this should be customized by YaTeX-item-regexp
("\\\\\\(sub\\)*item\\b\\(\\[[^]]*\\]\\)?" 0 label)
(YaTeX-19-region-section-type
- "\\\\caption\\(\\[[^]]*\\]\\)?{" label)
+ "\\\\caption\\(\\[[^]]*\\]\\)?\\>" label)
;; things that do some sort of cross-reference
(YaTeX-19-region-section-type
- "\\\\\\(\\(no\\)?cite\\|\\(page\\)?ref\\|label\\|index\\|glossary\\){"
+ "\\\\\\(\\(no\\)?cite\\|\\(page\\)?ref\\|label\\|index\\|glossary\\)\\>"
crossref)
;; things that bring in external files
@@ -373,7 +379,9 @@
list YaTeX-sectioning-level)
(while list
(setq pat (concat YaTeX-ec-regexp (car (car list))
- "\\*?\\(\\[[^]]*\\]\\)?{")
+ ;"\\*?\\(\\[[^]]*\\]\\)?\\>"
+ "\\>"
+ )
level (cdr (car list))
fg (format "hex-%02x%02x%02x"
(- fR (/ (* level fR fmin) lm 100))
@@ -416,7 +424,7 @@
(lambda (s) (regexp-quote (car s))))
sect
"\\|")
- "\\){")))
+ "\\)\\>")))
(if (setq single (append user-singlecmd-table tmp-singlecmd-table))
(setq single (concat "\\\\\\("
(mapconcat
@@ -511,6 +519,7 @@
;;; formula 'khaki
;;; label 'yellow-underlined))
(and YaTeX-emacs-19
+ (not (featurep 'xemacs))
(boundp 'byte-compile-current-file)
(if (and (boundp 'window-system) window-system)
(require 'hilit19)
diff --git a/yatexadd.el b/yatexadd.el
index abca1ac..c0508f0 100644
--- a/yatexadd.el
+++ b/yatexadd.el
@@ -2,7 +2,7 @@
;;; YaTeX add-in functions.
;;; yatexadd.el rev.13
;;; (c )1991-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Fri Jan 24 18:00:45 1997 on supra
+;;; Last modified Wed Jun 25 21:21:13 1997 on domani
;;; $Id$
;;;
@@ -140,6 +140,11 @@
"{" (read-string "Width: ") "}")
)
+(defun YaTeX:thebibliography ()
+ (setq section-name "bibitem")
+ ""
+)
+
;;;
;;Sample functions for section-type command.
;;;
@@ -282,7 +287,7 @@
)
(defun YaTeX:bibitem ()
- (let ((label (read-string "Citation label: ")))
+ (let ((label (read-string "Citation label for bibitem: ")))
(if (string= label "") ""
(concat "[" label "]")))
)
diff --git a/yatexenv.el b/yatexenv.el
index 5d878ba..4f205f7 100644
--- a/yatexenv.el
+++ b/yatexenv.el
@@ -2,7 +2,7 @@
;;; YaTeX environment-specific functions.
;;; yatexenv.el
;;; (c ) 1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Mon Apr 7 15:19:05 1997 on crx
+;;; Last modified Wed Jun 25 21:30:45 1997 on domani
;;; $Id$
;;;
@@ -188,6 +188,12 @@
(YaTeX-indent-line)
)
+(defun YaTeX-intelligent-newline-thebibliography ()
+ "Insert '\\bibitem '."
+ (YaTeX-indent-line)
+ (YaTeX-make-section nil nil nil "bibitem")
+ (YaTeX-indent-line)
+)
;;;
;; Intelligent newline
diff --git a/yatexlib.el b/yatexlib.el
index 17f1a8b..80f72b3 100644
--- a/yatexlib.el
+++ b/yatexlib.el
@@ -1,10 +1,283 @@
;;; -*- Emacs-Lisp -*-
-;;; YaTeX library of general functions.
+;;; YaTeX and yahtml common libraries, general functions and definitions
;;; yatexlib.el
-;;; (c )1994-1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Fri Apr 5 17:56:43 1996 on supra
+;;; (c )1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Tue Dec 16 14:48:22 1997 on firestorm
;;; $Id$
+;; General variables
+(defvar YaTeX-dos (memq system-type '(ms-dos windows-nt OS/2)))
+(defvar YaTeX-emacs-19 (>= (string-to-int emacs-version) 19))
+(defvar YaTeX-emacs-20 (>= (string-to-int emacs-version) 20))
+(defvar YaTeX-user-completion-table
+ (if YaTeX-dos "~/_yatexrc" "~/.yatexrc")
+ "*Default filename in which user completion table is saved.")
+
+(defvar YaTeX-japan (or (boundp 'NEMACS) (boundp 'MULE) YaTeX-emacs-20)
+ "Whether yatex mode is running on Japanese environment or not.")
+
+(defvar YaTeX-kanji-code-alist
+ (cond
+ ((boundp '*junet*)
+ (list (cons
+ 1
+ (if YaTeX-dos (if (boundp '*sjis-dos*) *sjis-dos* *sjis*dos)
+ *sjis*))
+ '(2 . *junet*) '(3 . *euc-japan*)))
+ (YaTeX-emacs-20
+ ;;(cdr-safe(assq 'coding-system (assoc "Japanese" language-info-alist)))
+ (list (cons
+ 1 (cond (YaTeX-dos 'shift_jis-dos)
+ ((member 'shift_jis (coding-system-list)) 'shift_jis-unix)
+ (t 'sjis)))
+ '(2 . iso-2022-7bit-unix)
+ '(3 . euc-japan))))
+ "Kanji-code expression translation table.")
+(defvar YaTeX-inhibit-prefix-letter nil
+ "*T for changing key definitions from [prefix] Letter to [prefix] C-Letter.")
+
+(defvar YaTeX-no-begend-shortcut nil
+ "*T for disabling shortcut of begin-type completion, [prefix] b d, etc.")
+
+(defvar YaTeX-default-pop-window-height 10
+ "Default typesetting buffer height.
+If integer, sets the window-height of typesetting buffer.
+If string, sets the percentage of it.
+If nil, use default pop-to-buffer.")
+
+(defvar YaTeX-create-file-prefix-g nil
+ "*Non-nil creates new file when [prefix] g on \\include{foo}.")
+
+(defvar YaTeX-nervous t
+ "*If you are nervous about maintenance of yatexrc, set this value to T.
+And you will have the local dictionary.")
+
+;----------- work variables ----------------------------------------
+(defvar YaTeX-typesetting-mode-map nil
+ "Keymap used in YaTeX typesetting buffer"
+)
+(if YaTeX-typesetting-mode-map nil
+ (setq YaTeX-typesetting-mode-map (make-keymap))
+ ;(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-parent-file nil
+ "*Main LaTeX source file name used when %#! expression doesn't exist.")
+(make-variable-buffer-local 'YaTeX-parent-file)
+
+;---------- Define default key bindings on YaTeX mode map ----------
+;;;###autoload
+(defun YaTeX-define-key (key binding &optional map)
+ "Define key on YaTeX-prefix-map."
+ (if YaTeX-inhibit-prefix-letter
+ (let ((c (aref key 0)))
+ (cond
+ ((and (>= c ?a) (<= c ?z)) (aset key 0 (1+ (- c ?a))))
+ ((and (>= c ?A) (<= c ?Z) (numberp YaTeX-inhibit-prefix-letter))
+ (aset key 0 (1+ (- c ?A))))
+ (t nil))))
+ (define-key (or map YaTeX-prefix-map) key binding))
+
+;;;###autoload
+(defun YaTeX-local-table-symbol (symbol)
+ "Return the lisp symbol which keeps local completion table of SYMBOL."
+ (intern (concat "YaTeX$"
+ default-directory
+ (symbol-name symbol))))
+
+;;;###autoload
+(defun YaTeX-sync-local-table (symbol)
+ "Synchronize local variable SYMBOL.
+Copy its corresponding directory dependent completion table to SYMBOL."
+ (if (boundp (YaTeX-local-table-symbol symbol))
+ (set symbol (symbol-value (YaTeX-local-table-symbol symbol)))))
+
+(defvar YaTeX-user-table-is-read nil
+ "Flag that means whether user completion table has been read or not.")
+;;;###autoload
+(defun YaTeX-read-user-completion-table (&optional forcetoread)
+ "Append user completion table of LaTeX macros"
+ (let*((user-table (expand-file-name YaTeX-user-completion-table))
+ (local-table (expand-file-name (file-name-nondirectory user-table)))
+ var localvar localbuf (curbuf (current-buffer)) sexp)
+ (if YaTeX-user-table-is-read nil
+ (message "Loading user completion table")
+ (if (file-exists-p user-table) (load-file user-table)
+ (message "Welcome to the field of YaTeX. I'm glad to see you!")))
+ (setq YaTeX-user-table-is-read t)
+ (cond
+ ((file-exists-p local-table)
+ (set-buffer (setq localbuf (find-file-noselect local-table)))
+ (widen)
+ (goto-char (point-min))
+ (while (re-search-forward "(setq \\([^ ]+\\)" nil t)
+ (setq var (intern (buffer-substring
+ (match-beginning 1) (match-end 1)))
+ localvar (YaTeX-local-table-symbol var))
+ (goto-char (match-beginning 0))
+ (setq sexp (buffer-substring (point)
+ (progn (forward-sexp) (point))))
+ (set-buffer curbuf)
+ (or (assq var (buffer-local-variables)) (make-local-variable var))
+ (eval (read sexp))
+ (or (and (boundp localvar)
+ (symbol-value localvar)
+ (not forcetoread))
+ (set localvar (symbol-value var)))
+ (set-buffer localbuf))
+ (kill-buffer localbuf)))
+ (set-buffer curbuf)))
+
+;;;###autoload
+(defun YaTeX-reload-dictionary ()
+ "Reload local dictionary.
+Use this function after editing ./.yatexrc."
+ (interactive)
+ (let ((YaTeX-user-table-is-read nil))
+ (YaTeX-read-user-completion-table t)))
+
+;;;###autoload
+(defun YaTeX-lookup-table (word type)
+ "Lookup WORD in completion table whose type is TYPE.
+This function refers the symbol tmp-TYPE-table, user-TYPE-table, TYPE-table.
+Typically, TYPE is one of 'env, 'section, 'fontsize, 'singlecmd."
+ (if (symbolp type) (setq type (symbol-name type)))
+ (or (assoc word (symbol-value (intern (concat "tmp-" type "-table"))))
+ (assoc word (symbol-value (intern (concat "user-" type "-table"))))
+ (assoc word (symbol-value (intern (concat type "-table"))))))
+
+;;;###autoload
+(defun YaTeX-update-table (vallist default-table user-table local-table)
+ "Update completion table if the car of VALLIST is not in current tables.
+Second argument DEFAULT-TABLE is the quoted symbol of default completion
+table, third argument USER-TABLE is user table which will be saved in
+YaTeX-user-completion-table, fourth argument LOCAL-TABLE should have the
+completion which is valid during current Emacs's session. If you
+want to make LOCAL-TABLE valid longer span (but restrict in this directory)
+create the file in current directory which has the same name with
+YaTeX-user-completion-table."
+ (let ((car-v (car vallist)) key answer
+ (file (file-name-nondirectory YaTeX-user-completion-table)))
+ (cond
+ ((assoc car-v (symbol-value default-table))
+ nil) ;Nothing to do
+ ((setq key (assoc car-v (symbol-value user-table)))
+ (if (equal (cdr vallist) (cdr key)) nil
+ ;; if association hits, but contents differ.
+ (message
+ "%s's attributes turned into %s" (car vallist) (cdr vallist))
+ (set user-table (delq key (symbol-value user-table)))
+ (set user-table (cons vallist (symbol-value user-table)))
+ (YaTeX-update-dictionary
+ YaTeX-user-completion-table user-table "user")))
+ ((setq key (assoc car-v (symbol-value local-table)))
+ (if (equal (cdr vallist) (cdr key)) nil
+ (message
+ "%s's attributes turned into %s" (car vallist) (cdr vallist))
+ (set local-table (delq key (symbol-value local-table)))
+ (set local-table (cons vallist (symbol-value local-table)))
+ (set (YaTeX-local-table-symbol local-table) (symbol-value local-table))
+ (YaTeX-update-dictionary file local-table)))
+ ;; All of above cases, there are some completion in tables.
+ ;; Then update tables.
+ (t
+ (if (not YaTeX-nervous)
+ (setq answer "u")
+ (message
+ (cond
+ (YaTeX-japan
+ "`%s'$B$NEPO?@h(B: U)$B%f!<%6<-=q(B L)$B%m!<%+%k<-=q(B N)$B%a%b%j(B D)$B$7$J$$(B")
+ (t
+ "Register `%s' into: U)serDic L)ocalDic N)one D)iscard"))
+ (if (> (length car-v) 23)
+ (concat (substring car-v 0 10) "..." (substring car-v -10))
+ car-v))
+ (setq answer (char-to-string (read-char))))
+ (cond
+ ((string-match answer "uy")
+ (set user-table (cons vallist (symbol-value user-table)))
+ (YaTeX-update-dictionary YaTeX-user-completion-table user-table "user")
+ )
+ ((string-match answer "tl")
+ (set local-table (cons vallist (symbol-value local-table)))
+ (set (YaTeX-local-table-symbol local-table) (symbol-value local-table))
+ (YaTeX-update-dictionary file local-table))
+ ((string-match answer "d") nil) ;discard it
+ (t (set default-table
+ (cons vallist (symbol-value default-table)))))))))
+
+;;;###autoload
+(defun YaTeX-cplread-with-learning
+ (prom default-table user-table local-table
+ &optional pred reqmatch init hsym)
+ "Completing read with learning.
+Do a completing read with prompt PROM. Completion table is what
+DEFAULT-TABLE, USER-TABLE, LOCAL table are appended in reverse order.
+Note that these tables are passed by the symbol.
+Optional arguments PRED, REQMATH and INIT are passed to completing-read
+as its arguments PREDICATE, REQUIRE-MATCH and INITIAL-INPUT respectively.
+If optional 8th argument HSYM, history symbol, is passed, use it as
+history list variable."
+ (YaTeX-sync-local-table local-table)
+ (let*((table (append (symbol-value local-table)
+ (symbol-value user-table)
+ (symbol-value default-table)))
+ (word (completing-read-with-history
+ prom table pred reqmatch init hsym)))
+ (if (and (string< "" word) (not (assoc word table)))
+ (YaTeX-update-table (list word) default-table user-table local-table))
+ word))
+
+;;;###autoload
+(defun YaTeX-update-dictionary (file symbol &optional type)
+ (let ((local-table-buf (find-file-noselect file))
+ (name (symbol-name symbol))
+ (value (symbol-value symbol)))
+ (save-excursion
+ (message "Updating %s dictionary..." (or type "local"))
+ (set-buffer local-table-buf)
+ (goto-char (point-max))
+ (search-backward (concat "(setq " name) nil t)
+ (delete-region (point) (progn (forward-sexp) (point)))
+ (delete-blank-lines)
+ (insert "(setq " name " '(\n")
+ (mapcar '(lambda (s)
+ (insert (format "%s\n" (prin1-to-string s))))
+ value)
+ (insert "))\n\n")
+ (delete-blank-lines)
+ (basic-save-buffer)
+ (kill-buffer local-table-buf)
+ (message "Updating %s dictionary...Done" (or type "local")))))
+
+;;;###autoload
+(defun YaTeX-define-begend-key-normal (key env &optional map)
+ "Define short cut YaTeX-make-begin-end key."
+ (YaTeX-define-key
+ key
+ (list 'lambda '(arg) '(interactive "P")
+ (list 'YaTeX-insert-begin-end env 'arg))
+ map))
+
+;;;###autoload
+(defun YaTeX-define-begend-region-key (key env &optional map)
+ "Define short cut YaTeX-make-begin-end-region key."
+ (YaTeX-define-key key (list 'lambda nil '(interactive)
+ (list 'YaTeX-insert-begin-end env t)) map))
+
+;;;###autoload
+(defun YaTeX-define-begend-key (key env &optional map)
+ "Define short cut key for begin type completion both for normal
+and region mode. To customize YaTeX, user should use this function."
+ (YaTeX-define-begend-key-normal key env map)
+ (if YaTeX-inhibit-prefix-letter nil
+ (YaTeX-define-begend-region-key
+ (concat (upcase (substring key 0 1)) (substring key 1)) env)))
+
;;;###autoload
(defun YaTeX-search-active-forward (string cmntrx &optional bound err cnt func)
"Search STRING which is not commented out by CMNTRX.
@@ -16,7 +289,8 @@
(setq found (funcall sfunc string bound err cnt))
(setq md (match-data)))
(or
- (YaTeX-in-verb-p (match-beginning 0))
+ (and (eq major-mode 'yatex-mode)
+ (YaTeX-in-verb-p (match-beginning 0)))
(save-excursion
(beginning-of-line)
(re-search-forward cmntrx (match-beginning 0) t)))))
@@ -119,8 +393,16 @@
(setq index pos) (setq pos -1))
(t (setq pos (1- pos))))
)
- index)
-)
+ index))
+
+;;;###autoload
+(defun point-beginning-of-line ()
+ (save-excursion (beginning-of-line)(point)))
+
+;;;###autoload
+(defun point-end-of-line ()
+ (save-excursion (end-of-line)(point)))
+
;;;###autoload
(defun YaTeX-showup-buffer (buffer &optional func select)
@@ -371,11 +653,158 @@
(or (featurep 'windows) (error "Why don't you use `windows.el'?"))
(win-switch-to-window 1 (- last-command-char win:base-key)))
+;;;###autoload
+(defun YaTeX-reindent (col)
+ "Remove current indentation and reindento to COL column."
+ (save-excursion
+ (beginning-of-line)
+ (skip-chars-forward " \t")
+ (if (/= col (current-column))
+ (progn
+ (delete-region (point) (progn (beginning-of-line) (point)))
+ (indent-to col))))
+ (skip-chars-forward " \t" (point-end-of-line)))
+
+(defun YaTeX-inner-environment (&optional quick)
+ "Return current inner-most environment.
+Non-nil for optional argument QUICK restricts search bound to most
+recent sectioning command. Matching point is stored to property 'point
+of 'YaTeX-inner-environment, which can be referred by
+ (get 'YaTeX-inner-environment 'point)."
+ (let*((nest 0)
+ (beg (YaTeX-replace-format-args
+ (regexp-quote YaTeX-struct-begin)
+ ;YaTeX-struct-begin ;=== TENTATIVE!! ==
+ YaTeX-struct-name-regexp
+ (if (eq major-mode 'yahtml-mode) "\\s *.*" "")
+ ""))
+ (end (YaTeX-replace-format-args
+ (regexp-quote YaTeX-struct-end)
+ YaTeX-struct-name-regexp "" ""))
+ (begend (concat "\\(" beg "\\)\\|\\(" end "\\)"))
+ bound m0
+ (htmlp (eq major-mode 'yahtml-mode))
+ (open
+ (concat "^" (or (cdr (assq major-mode '((yahtml-mode . "<")))) "{")))
+ (close
+ (concat "^"
+ (or (cdr(assq major-mode '((yahtml-mode . "\n\t >")))) "}"))))
+ (save-excursion
+ (if quick
+ (setq bound
+ (save-excursion
+ (if htmlp
+ ;;(re-search-backward YaTeX-sectioning-regexp nil 1)
+ (goto-char (point-min)) ;Is this enough? 97/6/26
+ (YaTeX-re-search-active-backward
+ (concat YaTeX-ec-regexp
+ "\\(" YaTeX-sectioning-regexp "\\)\\*?{")
+ YaTeX-comment-prefix nil 1))
+ (or (bobp) (end-of-line))
+ (point))))
+ (if (catch 'begin
+ (if (and (numberp bound) (< (point) bound)) (throw 'begin nil))
+ (while (YaTeX-re-search-active-backward
+ begend YaTeX-comment-prefix bound t)
+ (setq m0 (match-beginning 0))
+ (if (looking-at end) ;;(match-beginning 2)
+ (setq nest (1+ nest))
+ (setq nest (1- nest)))
+ (if (< nest 0)
+ (progn
+ (put 'YaTeX-inner-environment 'point m0)
+ (goto-char m0)
+ (put 'YaTeX-inner-environment 'indent (current-column))
+ (throw 'begin t)))))
+ (buffer-substring
+ (progn (skip-chars-forward open) (1+ (point)))
+ (progn (skip-chars-forward close) (point))))))
+)
+
+(defun YaTeX-end-environment ()
+ "Close opening environment"
+ (interactive)
+ (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 (y-or-n-p
+ (concat "Environment `" env
+ "' may be already closed. Force close?"))
+ nil
+ (error "end environment aborted."))))
+ (message "") ;Erase (y or n) message.
+ (YaTeX-insert-struc 'end env)
+ (save-excursion
+ (goto-char (or (get 'YaTeX-inner-environment 'point) (match-end 0)))
+ (if (pos-visible-in-window-p)
+ (sit-for (if YaTeX-dos 2 1))
+ (message "Matches with %s at line %d"
+ (YaTeX-replace-format-args YaTeX-struct-begin env "" "")
+ (count-lines (point-min) (point)))))))
+)
+
+;;;VER2
+(defun YaTeX-insert-struc (what env)
+ (cond
+ ((eq what 'begin)
+ (insert (YaTeX-replace-format-args
+ YaTeX-struct-begin env (YaTeX-addin env))))
+ ((eq what 'end)
+ (insert (YaTeX-replace-format-args YaTeX-struct-end env)))
+ (t nil))
+)
+
+;;; Function for menu support
+(defun YaTeX-define-menu (keymap bindlist)
+ "Define KEYMAP(symbol)'s menu-bindings according to BINDLIST.
+KEYMAP should be a quoted symbol of newly allocated keymap.
+BINDLIST consists of binding list. Each element is as follows.
+
+ '(menusymbol DOC_String . contents)
+
+CONTENTS is one of lambda-form, interactive function, or other keymap.
+See yatex19.el for example."
+ (cond
+ ((featurep 'xemacs)
+ (let (name)
+ (if (keymapp (symbol-value keymap))
+ (progn
+ (setq name (keymap-name (symbol-value keymap)))
+ (set keymap nil))
+ (setq name (car (symbol-value keymap)))
+ (set keymap (cdr (symbol-value keymap))))
+ (mapcar
+ (function
+ (lambda (bind)
+ (setq bind (cdr bind))
+ (if (eq (car-safe (cdr bind)) 'lambda)
+ (setcar (cdr bind) 'progn))
+ (if (stringp (car-safe (cdr bind)))
+ (set keymap
+ (cons (cdr bind) (symbol-value keymap)))
+ (set keymap
+ (cons (vector (car bind) (cdr bind) t)
+ (symbol-value keymap))))))
+ bindlist)
+ (set keymap (cons name (symbol-value keymap)))))
+ (t
+ (mapcar
+ (function
+ (lambda (bind)
+ (define-key (symbol-value keymap) (vector (car bind)) (cdr bind))))
+ bindlist))))
+
+
+
(defun bcf-and-exit ()
"Byte compile rest of argument and kill-emacs."
(if command-line-args-left
(progn
(mapcar 'byte-compile-file command-line-args-left)
(kill-emacs))))
+
(provide 'yatexlib)
diff --git a/yatexmth.el b/yatexmth.el
index b191a51..fa9cb61 100644
--- a/yatexmth.el
+++ b/yatexmth.el
@@ -1,8 +1,8 @@
;;; -*- Emacs-Lisp -*-
;;; YaTeX math-mode-specific functions.
-;;; yatexmth.el rev.4
+;;; yatexmth.el
;;; (c )1993-1997 by HIROSE Yuuji [yuuji@ae.keio.ac.jp]
-;;; Last modified Fri Jan 24 18:00:08 1997 on supra
+;;; Last modified Tue Nov 25 12:33:05 1997 on firestorm
;;; $Id$
;;; [Customization guide]
@@ -211,6 +211,7 @@
("->" "rightarrow" ("->" "��"))
("\C-f" "rightarrow" ("->" "��"))
("-->" "longrightarrow" ("-->" "--��"))
+ ("=>" "Rightarrow" "=>")
("==>" "Longrightarrow" "==>")
("<->" "leftrightarrow" ("<->" "����"))
("<-->" "longleftrightarrow" ("<---->" "��--��"))
diff --git a/yatexprc.el b/yatexprc.el
index d5b05e0..56ad255 100644
--- a/yatexprc.el
+++ b/yatexprc.el
@@ -2,10 +2,11 @@
;;; YaTeX process handler.
;;; yatexprc.el
;;; (c )1993-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Mon Jan 27 10:22:06 1997 on crx
+;;; Last modified Thu Dec 11 16:16:21 1997 on crx
;;; $Id$
-(require 'yatex)
+;(require 'yatex)
+(require 'yatexlib)
(defvar YaTeX-typeset-process nil
"Process identifier for jlatex"
@@ -24,6 +25,18 @@
(if YaTeX-dos "/c" "-c"))
"Shell option for command execution.")
+(defvar YaTeX-latex-message-code
+ (cond
+ (YaTeX-dos (cdr (assq 1 YaTeX-kanji-code-alist)))
+ ((and YaTeX-emacs-20 (member 'undecided (coding-system-list))
+ 'undecided))
+ ((featurep 'mule)
+ (or (and (boundp '*autoconv*) *autoconv*)
+ (and (fboundp 'coding-system-list) 'automatic-conversion)))
+ ((boundp 'NEMACS)
+ (cdr (assq (if YaTeX-dos 1 2) YaTeX-kanji-code-alist))))
+ "Process coding system for LaTeX.")
+
(if YaTeX-typeset-buffer-syntax nil
(setq YaTeX-typeset-buffer-syntax
(make-syntax-table (standard-syntax-table)))
@@ -38,7 +51,10 @@
(interactive)
(save-excursion
(let ((p (point)) (window (selected-window)) execdir (cb (current-buffer))
- (map YaTeX-typesetting-mode-map))
+ (map YaTeX-typesetting-mode-map)
+ (outcode
+ (cond ((eq major-mode 'yatex-mode) YaTeX-coding-system)
+ ((eq major-mode 'yahtml-mode) yahtml-coding-system))))
(if (and YaTeX-typeset-process
(eq (process-status YaTeX-typeset-process) 'run))
;; if tex command is halting.
@@ -57,12 +73,9 @@
(cd execdir)
(erase-buffer)
(cond
- (YaTeX-dos ;if MS-DOS
- ;(YaTeX-put-nonstopmode)
+ ((not (fboundp 'start-process)) ;YaTeX-dos;if MS-DOS
(call-process
- shell-file-name nil buffer nil YaTeX-shell-command-option command)
- ;(YaTeX-remove-nonstopmode)
- )
+ shell-file-name nil buffer nil YaTeX-shell-command-option command))
(t ;if UNIX
(set-process-buffer
(setq YaTeX-typeset-process
@@ -76,9 +89,15 @@
(set-syntax-table YaTeX-typeset-buffer-syntax)
(setq mode-name modename)
(if YaTeX-typeset-process ;if process is running (maybe on UNIX)
- (cond ((boundp 'MULE)
+ (cond ((fboundp 'set-current-process-coding-system)
(set-current-process-coding-system
- YaTeX-latex-message-code YaTeX-coding-system))
+ YaTeX-latex-message-code outcode))
+ ((fboundp 'set-process-coding-system)
+ (set-process-coding-system
+ YaTeX-typeset-process YaTeX-latex-message-code outcode))
+ (YaTeX-emacs-20
+ (set-buffer-process-coding-system
+ YaTeX-latex-message-code outcode))
((boundp 'NEMACS)
(set-kanji-process-code YaTeX-latex-message-code))))
(if YaTeX-dos (message "Done.")
@@ -213,7 +232,7 @@
(set-buffer (find-file-noselect texput)))
;;(find-file YaTeX-texput-file)
(erase-buffer)
- (if YaTeX-need-nonstop
+ (if (and (eq major-mode 'yatex-mode) YaTeX-need-nonstop)
(insert "\\nonstopmode{}\n"))
(insert preamble "\n" subpreamble "\n")
(setq lineinfo (list (count-lines 1 (point-end-of-line)) lineinfo))
@@ -340,7 +359,7 @@
(setq default-directory df)
(cd df))
(erase-buffer)
- (if YaTeX-dos
+ (if (not (fboundp 'start-process))
(call-process
shell-file-name nil buffer nil YaTeX-shell-command-option command)
(if (and (get-buffer-process buffer)
@@ -386,7 +405,7 @@
(setq default-directory dir) ;for 18
(cd dir) ;for 19
(cond
- (YaTeX-dos ;if MS-DOS
+ ((not (fboundp 'start-process)) ;if MS-DOS
(send-string-to-terminal "\e[2J\e[>5h") ;CLS & hide cursor
(call-process shell-file-name "con" "*dvi-preview*" nil
YaTeX-shell-command-option
@@ -573,7 +592,7 @@
)
(defun YaTeX-put-nonstopmode ()
- (if (and YaTeX-need-nonstop (eq major-mode 'yatex-mode))
+ (if (and (eq major-mode 'yatex-mode) YaTeX-need-nonstop)
(if (re-search-backward "\\\\nonstopmode{}" (point-min) t)
nil ;if already written in text then do nothing
(save-excursion
@@ -585,7 +604,7 @@
)
(defun YaTeX-remove-nonstopmode ()
- (if (and YaTeX-need-nonstop (eq major-mode 'yatex-mode)) ;for speed
+ (if (and (eq major-mode 'yatex-mode) YaTeX-need-nonstop) ;for speed
(save-excursion
(YaTeX-visit-main t)
(goto-char (point-min))
@@ -692,7 +711,7 @@
(erase-buffer)
(cd dir) ;for 19
(cond
- (YaTeX-dos
+ ((not (fboundp 'start-process))
(call-process shell-file-name "con" "*dvi-printing*" nil
YaTeX-shell-command-option cmd))
(t
diff --git a/yatexsec.el b/yatexsec.el
index e1ad24d..5bcf36e 100644
--- a/yatexsec.el
+++ b/yatexsec.el
@@ -277,6 +277,7 @@
)
(defvar YaTeX-sectioning-buffer "*Sectioning lines*")
+(defvar YaTeX-sectioning-indent 1)
(defun YaTeX-colloect-sections ()
"Collect all the lines which contains sectioning command."
(let ((cw (selected-window)) level indent begp (prevp 1) (prevl 1)
@@ -296,7 +297,7 @@
begp (match-beginning 0))
;;(beginning-of-line)
;;(skip-chars-forward " \t")
- (setq indent (format "%%%ds" level))
+ (setq indent (format "%%%ds" (* level YaTeX-sectioning-indent)))
(princ (format indent ""))
(if (YaTeX-on-comment-p) (princ "%"))
(princ (buffer-substring begp (progn (forward-list 1) (point))))
@@ -393,7 +394,8 @@
(let (buffer-read-only)
(delete-region
(point) (progn (skip-chars-forward " \t") (point)))
- (indent-to-column (cdr (assoc nsc YaTeX-sectioning-level)))
+ (indent-to-column (* (cdr (assoc nsc YaTeX-sectioning-level))
+ YaTeX-sectioning-indent))
(skip-chars-forward "^\\\\")
(delete-region
(1+ (point)) (progn (skip-chars-forward "^*{") (point)))
'
+;;; `'
+;;; * [prefix] l ` ... ' �� ` ... ' �̂悤
+;;; �ȃe�L�X�g�X�^�C���w��̃^�O��⊮���܂��B
+;;; ���̕⊮�@�\�͒ʏ� [prefix] b �ŕ⊮�ł�����̂�
+;;; ��s���ŏ��������Ƃ��ɂ��p���邱�Ƃ��o���܂��B
+;;; * [prefix] m `