yatex
changeset 382:e009c4f86ede dev
Change default directory of HELP file to under `site-lisp/yatex'.
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Tue, 06 Jan 2015 20:29:08 +0900 |
| parents | fc1ad3b337a9 |
| children | 35d5b9b3fbda |
| files | install makefile yatex.el yatexhlp.el |
| diffstat | 4 files changed, 70 insertions(+), 23 deletions(-) [+] |
line diff
1.1 --- a/install Sun Jan 04 23:30:57 2015 +0900 1.2 +++ b/install Tue Jan 06 20:29:08 2015 +0900 1.3 @@ -20,16 +20,24 @@ 1.4 in your ~/.emacs. 1.5 などとします。 1.6 1.7 -Then edit makefile and set your environment variable `DISPLAY' correctly, 1.8 -exec the next. 1.9 -続いて makefile を編集し、環境変数 DISPLAY の値を正しくセットしてから 1.10 +Then edit makefile and exec the next command. 1.11 +続いて makefile を編集し、 1.12 1.13 % make install 1.14 + (or "sudo make install") 1.15 1.16 でインストールを行ってください。 1.17 1.18 - If `make install' fails, do as follows; 1.19 - もし `make install' でうまく行かない時は下記のように手動でインストール 1.20 +Without installing to default-dir, you can use yatex by adding the elisp 1.21 +obtained by below to ~/.emacs. 1.22 +インストールしなくても以下のコマンド出力を ~/.emacs に追加すれば 1.23 +普通に使えます。 1.24 + 1.25 + % make show-init2 1.26 + 1.27 + 1.28 +If `make install' fails, do as follows; 1.29 +もし `make install' でうまく行かない時は下記のように手動でインストール 1.30 を行ってください。 1.31 1.32 First, copy `*.el' to suitable directory.
2.1 --- a/makefile Sun Jan 04 23:30:57 2015 +0900 2.2 +++ b/makefile Tue Jan 06 20:29:08 2015 +0900 2.3 @@ -3,13 +3,13 @@ 2.4 # 2.5 2.6 # Edit these variables to be suitable for your site 2.7 -PREFIX = /usr/local 2.8 +EMACS = emacs 2.9 +#EMACS = mule 2.10 +PREFIX = `${EMACS} -batch --eval '(princ (expand-file-name "../../../.." data-directory))'` 2.11 +# PREFIX = /usr/local 2.12 2.13 -## mule2 2.14 -#EMACS = mule 2.15 #EMACSDIR= ${PREFIX}/lib/${EMACS} 2.16 ## emacs20 or later 2.17 -EMACS = emacs 2.18 EMACSDIR= ${PREFIX}/share/${EMACS} 2.19 ## XEmacs 2.20 #EMACS = xemacs 2.21 @@ -25,8 +25,8 @@ 2.22 LISPDIR = ${EMACSDIR}/site-lisp/yatex 2.23 # LISPDIR = ${EMACSDIR}/site-packages/lisp/yatex 2.24 DOCDIR = ${LISPDIR}/docs 2.25 -HELPDIR = ${EMACSDIR}/site-lisp 2.26 -INFODIR = ${PREFIX}/info 2.27 +HELPDIR = ${LISPDIR}/help 2.28 +INFODIR = ${PREFIX}/share/info 2.29 2.30 TAR = tar 2.31 INSTALL = install -c -m 444 2.32 @@ -41,7 +41,6 @@ 2.33 # Do not edit below 2.34 ################### 2.35 # make install to install YaTeX into public space 2.36 -# make install-nw same as above, but -nw mode, or Emacs18(Nemacs) 2.37 # make ajimi to feel taste 2.38 # make ajimi-nw same as above, but -nw mode 2.39 # make package to create package for relase 2.40 @@ -87,7 +86,7 @@ 2.41 # @echo "If you don't use X-clinet of Emacs," 2.42 # @echo 'type "make install-nw" instead.' 2.43 2.44 -install: install-real 2.45 +install: install-real install-message 2.46 #install-yahtml: bytecompile-yahtml 2.47 install-yahtml: 2.48 [ -d ${LISPDIR} ] || mkdir ${LISPDIR} 2.49 @@ -98,9 +97,10 @@ 2.50 ${INSTALL} *.el* ${LISPDIR} 2.51 2.52 install-real: 2.53 - if [ ! -d ${LISPDIR} ]; then ${MKDIR} ${LISPDIR}; fi 2.54 - if [ ! -d ${DOCDIR} ]; then ${MKDIR} ${DOCDIR}; fi 2.55 - if [ ! -d ${INFODIR} ]; then ${MKDIR} ${INFODIR}; fi 2.56 + [ -d ${LISPDIR} ] || ${MKDIR} ${LISPDIR} 2.57 + [ -d ${HELPDIR} ] || ${MKDIR} ${HELPDIR} 2.58 + [ -d ${DOCDIR} ] || ${MKDIR} ${DOCDIR} 2.59 + [ -d ${INFODIR} ] || ${MKDIR} ${INFODIR} 2.60 for f in *.el; do \ 2.61 rm -f ${LISPDIR}/$${f}c; \ 2.62 done 2.63 @@ -108,10 +108,24 @@ 2.64 ${INSTALL} ${DOCSRC} ${DOCDIR} 2.65 ${INSTALL} ${DOCOBJ} ${INFODIR} 2.66 ${INSTALL} ${HELP} ${HELPDIR} 2.67 + 2.68 +install-message: 2.69 @echo "--------------------------------" 2.70 @echo "If you have install-info command, type 'make install-info'." 2.71 @echo "If not, add next lines into your site's info dir manually." 2.72 @cat dir 2.73 + @echo "--------------------------------" 2.74 + @echo "=== INSTALLATION DONE ===" 2.75 + @echo " You might need to add these expression below to your ~/.emacs" 2.76 + @echo " ｴｰﾎｻ. ~/.emacs ﾅ､ﾋｰﾊｲｼ､ﾄﾉｲﾃ､ｹ､ﾉｬﾍﾗ､ｬ､｢､､ｫ､筅ｷ､､ﾞ､ｻ､." 2.77 + @echo 2.78 + @echo ";;; ------ Startup definitions for YaTeX ------ ;;;" 2.79 + @make show-init 2.80 + @echo ";;; ------------------------------------------- ;;;" 2.81 + @echo 2.82 + @echo " To get elisp above again, call make command as below." 2.83 + @echo " ｾ蠏ｭelisp､ｺﾆﾅﾙﾆﾀ､､ﾋ､ﾏｰﾊｲｼ､ﾎ､隍ｦ､ﾋmake､ｵｯﾆｰ､ｷ､ﾆ､ｯ､ﾀ､ｵ､､." 2.84 + @echo " % make $${PREFIX:+PREFIX=$$PREFIX }show-init" 2.85 2.86 install-info: 2.87 for f in ${DOCOBJ}; do \ 2.88 @@ -120,6 +134,30 @@ 2.89 --section=Emacs $${f} ${INFODIR}/dir; \ 2.90 done 2.91 2.92 +show-init: 2.93 + @printf '%s\n%s\n%s\n%s\n' \ 2.94 + '(setq auto-mode-alist' \ 2.95 + " (cons (cons \"\\.tex$$\" 'yatex-mode) auto-mode-alist))" \ 2.96 + "(autoload 'yatex-mode \"yatex\" \"Yet Another LaTeX mode\" t)" \ 2.97 + "(add-to-list 'load-path \"${LISPDIR}\")" 2.98 + @printf '(setq tex-command "%s")%s\n' \ 2.99 + `CMDS='platex pdflatex ptex2pdf lualatex' DFLT=latex \ 2.100 + make search-cmd` 2.101 + @printf '(setq dvi2-command "%s")%s\n' \ 2.102 + `CMDS='pxdvi xdvik kxdvi dviout texworks' DFLT=xdvi \ 2.103 + make search-cmd` 2.104 + @printf '(setq tex-pdfview-command "%s")%s\n' \ 2.105 + `CMDS='evince mupdf xpdf kpdf texworks sumatrapdf' \ 2.106 + DFLT=acroread \ 2.107 + make search-cmd` 2.108 + 2.109 +show-init2: 2.110 + @make LISPDIR=$$PWD show-init 2.111 + 2.112 +search-cmd: 2.113 + @for f in $$CMDS; do \ 2.114 + type $$f >/dev/null 2>&1 && echo $$f && exit 0; done; echo $$DFLT 2.115 + 2.116 install-nw: bytecompile-nw install-real 2.117 2.118 elc: bytecompile
3.1 --- a/yatex.el Sun Jan 04 23:30:57 2015 +0900 3.2 +++ b/yatex.el Tue Jan 06 20:29:08 2015 +0900 3.3 @@ -1,6 +1,6 @@ 3.4 ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*- 3.5 -;;; (c)1991-2014 by HIROSE Yuuji.[yuuji@yatex.org] 3.6 -;;; Last modified Wed Dec 31 18:50:06 2014 on sdr 3.7 +;;; (c)1991-2015 by HIROSE Yuuji.[yuuji@yatex.org] 3.8 +;;; Last modified Tue Jan 6 08:53:32 2015 on firestorm 3.9 ;;; $Id$ 3.10 ;;; The latest version of this software is always available at; 3.11 ;;; http://www.yatex.org/ 3.12 @@ -8,7 +8,7 @@ 3.13 ;;; Code: 3.14 (require 'comment) 3.15 (require 'yatexlib) 3.16 -(defconst YaTeX-revision-number "1.78.3" 3.17 +(defconst YaTeX-revision-number "1.78.4" 3.18 "Revision number of running yatex.el") 3.19 3.20 ;---------- Local variables ----------
4.1 --- a/yatexhlp.el Sun Jan 04 23:30:57 2015 +0900 4.2 +++ b/yatexhlp.el Tue Jan 06 20:29:08 2015 +0900 4.3 @@ -1,7 +1,7 @@ 4.4 ;;; yatexhlp.el --- YaTeX helper with LaTeX commands and macros 4.5 ;;; 4.6 -;;; (c)1994,1998,2004,2014 by HIROSE Yuuji.[yuuji@yatex.org] 4.7 -;;; Last modified Sun Dec 21 22:55:07 2014 on firestorm 4.8 +;;; (c)1994,1998,2004,2014,2015 by HIROSE Yuuji.[yuuji@yatex.org] 4.9 +;;; Last modified Tue Jan 6 20:24:31 2015 on firestorm 4.10 ;;; $Id$ 4.11 4.12 ;;; Code: 4.13 @@ -12,8 +12,9 @@ 4.14 (cond 4.15 ((and (boundp 'site-directory) site-directory) site-directory) 4.16 ((string-match "\\.app/" doc-directory) ;For Emacs.app(Darwin) 4.17 - (expand-file-name "../site-lisp" doc-directory)) 4.18 - (YaTeX-emacs-19 (expand-file-name "../../site-lisp" doc-directory)) 4.19 + (expand-file-name "../site-lisp/yatex" doc-directory)) 4.20 + (YaTeX-emacs-19 4.21 + (expand-file-name "../../site-lisp/yatex" doc-directory)) 4.22 (t exec-directory)))) 4.23 (defvar YaTeX-help-file 4.24 (expand-file-name help-file help-dir)