yatex
changeset 506:feef2aa1f50f dev
Bibtex-command accepts %k like "pbibtex -kanji=%k".
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Tue, 02 Jan 2018 23:35:07 +0900 |
parents | 55a20e3120a0 |
children | 8ca2e7ce2392 |
files | yatex.el yatexprc.el |
diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line diff
1.1 --- a/yatex.el Tue Jan 02 23:28:35 2018 +0900 1.2 +++ b/yatex.el Tue Jan 02 23:35:07 2018 +0900 1.3 @@ -1,6 +1,6 @@ 1.4 ;;; yatex.el --- Yet Another tex-mode for emacs //–ì’¹// -*- coding: sjis -*- 1.5 ;;; (c)1991-2017 by HIROSE Yuuji.[yuuji@yatex.org] 1.6 -;;; Last modified Tue Jan 2 19:26:15 2018 on firestorm 1.7 +;;; Last modified Tue Jan 2 23:11:09 2018 on firestorm 1.8 ;;; $Id$ 1.9 ;;; The latest version of this software is always available at; 1.10 ;;; https://www.yatex.org/ 1.11 @@ -60,7 +60,7 @@ 1.12 %k -> One of Kanji code mnemonic: euc, jis, sjis, utf8 1.13 ") 1.14 1.15 -(defvar bibtex-command (if YaTeX-japan "jbibtex" "bibtex") 1.16 +(defvar bibtex-command (if YaTeX-japan "pbibtex -kanji=%k" "bibtex") 1.17 "*Default command of BibTeX. 1.18 Overridden with `%#BIBTEX CommandLine...' in the buffer.") 1.19
2.1 --- a/yatexprc.el Tue Jan 02 23:28:35 2018 +0900 2.2 +++ b/yatexprc.el Tue Jan 02 23:35:07 2018 +0900 2.3 @@ -1,7 +1,7 @@ 2.4 ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*- 2.5 ;;; 2.6 ;;; (c)1993-2017 by HIROSE Yuuji.[yuuji@yatex.org] 2.7 -;;; Last modified Tue Jan 2 17:50:40 2018 on firestorm 2.8 +;;; Last modified Tue Jan 2 23:31:34 2018 on firestorm 2.9 ;;; $Id$ 2.10 2.11 ;;; Code: 2.12 @@ -753,8 +753,10 @@ 2.13 (setq pparg (substring cmd 0 (string-match "[;&]" cmd)) ;rm multistmt 2.14 pparg (substring pparg (rindex pparg ? )) ;get last arg 2.15 pparg (substring pparg 0 (rindex pparg ?.)) ;rm ext 2.16 - bibcmd (or (YaTeX-get-builtin "BIBTEX") bibtex-command)) 2.17 - (or (string-match "\\s " bibcmd) ;if bibcmd has no spaces, 2.18 + bibcmd (YaTeX-replace-format 2.19 + (or (YaTeX-get-builtin "BIBTEX") bibtex-command) 2.20 + "k" (YaTeX-kanji-ptex-mnemonic))) 2.21 + (or (string-match "\\s [^-]" bibcmd) ;if bibcmd has no argument, 2.22 (setq bibcmd (concat bibcmd pparg))) ;append argument(== %#!) 2.23 (and pp 2.24 (stringp pp) 2.25 @@ -834,8 +836,10 @@ 2.26 (save-excursion (YaTeX-visit-main t) buffer-file-name))) 2.27 (mainroot (file-name-nondirectory (substring main 0 (rindex main ?.)))) 2.28 (alist YaTeX-call-builtin-on-file) 2.29 - (b-in (or (YaTeX-get-builtin builtin-type) 2.30 - (cdr (assoc builtin-type alist)))) 2.31 + (b-in (YaTeX-replace-format 2.32 + (or (YaTeX-get-builtin builtin-type) 2.33 + (cdr (assoc builtin-type alist))) 2.34 + "k" (YaTeX-kanji-ptex-mnemonic))) 2.35 (command b-in)) 2.36 (if (or update (null b-in)) 2.37 (progn