yatex
changeset 609:c1b39bbfcf34
Merged with 1.83
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Sun, 25 Dec 2022 14:13:45 +0900 |
parents | 638284a7a9d0 5aa2610bd397 |
children | dd4ed4c255c7 |
files | |
diffstat | 9 files changed, 82 insertions(+), 26 deletions(-) [+] |
line diff
1.1 --- a/.hgtags Thu Sep 29 10:00:57 2022 +0900 1.2 +++ b/.hgtags Sun Dec 25 14:13:45 2022 +0900 1.3 @@ -22,3 +22,4 @@ 1.4 ca7cf34e959cc35960081f25b0f903b1bd2a191f master-beginning 1.5 fbb636ff0fe3fd784af7697db5805a20d33b04d2 yatex-1.81 1.6 4dad5f91b26cb44a8caa888fe8aa0aad1f1f10bb yatex-1.82 1.7 +157aa7974191bbb4707d26b05ce830282ad70ef5 yatex-1.83
2.1 --- a/yahtml.el Thu Sep 29 10:00:57 2022 +0900 2.2 +++ b/yahtml.el Sun Dec 25 14:13:45 2022 +0900 2.3 @@ -1,8 +1,8 @@ 2.4 ;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*- 2.5 -;;; (c) 1994-2019 by HIROSE Yuuji [yuuji(@)yatex.org] 2.6 +;;; (c) 1994-2022 by HIROSE Yuuji [yuuji(@)yatex.org] 2.7 ;;; $Id$ 2.8 2.9 -(defconst yahtml-revision-number "1.80.1" 2.10 +(defconst yahtml-revision-number "1.83" 2.11 "Revision number of running yahtml.el") 2.12 2.13 ;;; Commentary: 2.14 @@ -1185,7 +1185,7 @@ 2.15 (defvar yahtml-link-types-alist 2.16 '(("alternate") ("stylesheet") ("start") ("next") ("prev") 2.17 ("contents") ("index") ("glossary") ("chapter") ("section") 2.18 - ("subsection") ("appendix") ("help") ("bookmark"))) 2.19 + ("subsection") ("appendix") ("help") ("bookmark") ("manifest"))) 2.20 2.21 (defvar yahtml-content-types-alist 2.22 '(("text/css") ("text/html") ("text/plain") ("text/richtext") 2.23 @@ -1481,7 +1481,9 @@ 2.24 2.25 (defvar yahtml-input-types 2.26 '(("text") ("password") ("checkbox") ("radio") ("submit") 2.27 - ("reset") ("image") ("hidden") ("file"))) 2.28 + ("reset") ("image") ("hidden") ("file") 2.29 + ("date") ("time") ("datetime-local") ("week") ("number") ("tel") 2.30 + ("range") ("color"))) 2.31 2.32 (defun yahtml:input () 2.33 "Add-in function for `input' form" 2.34 @@ -1502,6 +1504,13 @@ 2.35 (yahtml-make-optional-argument "value" value) 2.36 (yahtml-make-optional-argument "id" id) 2.37 (yahtml-make-optional-argument "size" size) 2.38 + (if (string-match "range" type) 2.39 + (concat (yahtml-make-optional-argument 2.40 + "min" (YaTeX-read-string-or-skip "min: ")) 2.41 + (yahtml-make-optional-argument 2.42 + "max" (YaTeX-read-string-or-skip "max: ")) 2.43 + (yahtml-make-optional-argument 2.44 + "step" (YaTeX-read-string-or-skip "step: ")))) 2.45 (yahtml-make-optional-argument "maxlength" maxlength)))) 2.46 2.47 (defun yahtml:datalist () 2.48 @@ -1620,7 +1629,7 @@ 2.49 (concat 2.50 (yahtml-make-optional-argument "rel" rel) 2.51 (yahtml-make-optional-argument 2.52 - "type" (yahtml-read-parameter "type" "text/css")) 2.53 + "type" (yahtml-read-parameter "type")) 2.54 (yahtml-make-optional-argument 2.55 "href" 2.56 (read-from-minibuffer-with-history
3.1 --- a/yatex.el Thu Sep 29 10:00:57 2022 +0900 3.2 +++ b/yatex.el Sun Dec 25 14:13:45 2022 +0900 3.3 @@ -1,6 +1,6 @@ 3.4 ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*- 3.5 -;;; (c)1991-2020 by HIROSE Yuuji.[yuuji@yatex.org] 3.6 -;;; Last modified Fri Sep 23 06:28:18 2022 on firestorm 3.7 +;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org] 3.8 +;;; Last modified Sun Dec 25 13:57:49 2022 on firestorm 3.9 ;;; $Id$ 3.10 ;;; The latest version of this software is always available at; 3.11 ;;; https://www.yatex.org/ 3.12 @@ -16,7 +16,7 @@ 3.13 3.14 ;;; Code: 3.15 (require 'yatexlib) 3.16 -(defconst YaTeX-revision-number "1.82.1" 3.17 +(defconst YaTeX-revision-number "1.83" 3.18 "Revision number of running yatex.el") 3.19 3.20 ;---------- Local variables ---------- 3.21 @@ -49,7 +49,7 @@ 3.22 3.23 (defvar tex-command 3.24 (cond 3.25 - (YaTeX-use-LaTeX2e "platex -kanji=%k") 3.26 + (YaTeX-use-LaTeX2e "platex -kanji=%k -synctex=1") 3.27 (YaTeX-japan "jlatex") 3.28 (t "latex")) 3.29 "*Default command for typesetting LaTeX text. 3.30 @@ -362,7 +362,8 @@ 3.31 (defvar YaTeX-ams-math-begin-alist 3.32 '(("align") ("align*") ("multline") ("multline*") ("gather") ("gather*") 3.33 ("alignat") ("alignat*") ("xalignat") ("xalignat*") 3.34 - ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*"))) 3.35 + ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*") 3.36 + ("fleqn"))) 3.37 (defvar YaTeX-ams-math-gathering-alist 3.38 '(("matrix") ("pmatrix") ("bmatrix") ("Bmatrix") ("vmatrix") ("Vmatrix") 3.39 ("split") ("split*") ("aligned") ("aligned*") ("alignedat") ("gathered")
4.1 --- a/yatex.new Thu Sep 29 10:00:57 2022 +0900 4.2 +++ b/yatex.new Sun Dec 25 14:13:45 2022 +0900 4.3 @@ -1,6 +1,18 @@ 4.4 What's new in YaTeX/yahtml 4.5 野鳥/yahtml - 各バージョンの変更点について 4.6 4.7 +1.83 == yatex == 4.8 + Evince-dbus連携見直し(Thanks to TeX Wiki)。 4.9 + latex-message-kanji-code 0 でプロセスコード 'undicided にしてみた。 4.10 + LuaTeX等で直接PDFが出されたときにはdvipdfmx省略。 4.11 + uplatex関連のものなどをいくつか追加。 4.12 + ;di で \displaystyle 補完。 4.13 + Dbusでのevince-reverse-search実験実装。 4.14 + アドイン追加: wraptable, spacing, tablecolor 4.15 + 補完追加: fleqn 4.16 + == yahtml == 4.17 + デフォルトテーブルHTML5 4.18 + 4.19 1.82 == yatex == 4.20 YaTeX::usepackage-alist-default を廃止し、 4.21 YaTeX-package-alist-default を利用するようにした。
5.1 --- a/yatexadd.el Thu Sep 29 10:00:57 2022 +0900 5.2 +++ b/yatexadd.el Sun Dec 25 14:13:45 2022 +0900 5.3 @@ -1,6 +1,6 @@ 5.4 ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*- 5.5 -;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org] 5.6 -;;; Last modified Thu Sep 22 11:41:04 2022 on firestorm 5.7 +;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org] 5.8 +;;; Last modified Fri Dec 2 08:40:27 2022 on firestorm 5.9 ;;; $Id$ 5.10 5.11 ;;; Code: 5.12 @@ -1855,6 +1855,7 @@ 5.13 ("oneside") ("twoside") ("draft") ("final") ("leqno") ("fleqn") ("openbib") 5.14 ("tombow") ("titlepage") ("notitlepage") ("dvips") 5.15 ("mingoth") ;for jsarticle 5.16 + ("uplatex") ;for uplatex 5.17 ("clock") ;for slides class only 5.18 ) 5.19 "Default options list for documentclass") 5.20 @@ -1892,7 +1893,9 @@ 5.21 5.22 (defvar YaTeX:documentclasses-default 5.23 '(("article") ("jarticle") ("report") ("jreport") ("book") ("jbook") 5.24 - ("jsarticle") ("jsbook") 5.25 + ("ltjsarticle") ("ltjsreport") ("ltjsbook") 5.26 + ("ltjarticle") ("ltjreport") ("ltjbook") 5.27 + ("jsarticle") ("jsreport") ("jsbook") 5.28 ("j-article") ("j-report") ("j-book") 5.29 ("letter") ("slides") ("ltxdoc") ("ltxguide") ("ltnews") ("proc")) 5.30 "Default documentclass alist") 5.31 @@ -2098,7 +2101,8 @@ 5.32 (if (string= "" str) "" 5.33 (concat "[" str "]")))) 5.34 5.35 -(defvar YaTeX::get-boundingbox-cmd YaTeX-cmd-gs 5.36 +(defvar YaTeX::get-boundingbox-cmd 5.37 + (or (YaTeX-executable-find "extractbb") YaTeX-cmd-gs) 5.38 "Command to get bounding box from PDF files. 5.39 Possible values are `gs' and `extractbb'.") 5.40 5.41 @@ -2132,7 +2136,7 @@ 5.42 (or (fboundp 'yahtml-get-image-info) 5.43 (progn 5.44 (load "yahtml" t) (featurep 'yahtml))) ;(require 'yahtml nil t) 5.45 - (if (string-match "\\.pdf" imgfile) 5.46 + (if (string-match "\\.\\(pdf\\|png\\)" imgfile) 5.47 (and 5.48 (setq info (YaTeX::get-boundingbox imgfilepath)) 5.49 (stringp info) 5.50 @@ -2250,6 +2254,21 @@ 5.51 ((memq c '(?c ?C)) (setq left "{\\scriptsize " right "}"))) 5.52 (format "%s%s%s" left char right))))) 5.53 5.54 + 5.55 +;;; -------------------- booktab staff -------------------- 5.56 +(defun YaTeX::toprule (argp) 5.57 + (if (equal argp 1) (YaTeX:read-length "Top Rule Width: "))) 5.58 +(defun YaTeX::midrule (argp) 5.59 + (if (equal argp 1) (YaTeX:read-length "Middle Rule Width: "))) 5.60 +(defun YaTeX::cmidrule (argp) 5.61 + (if (equal argp 1) (YaTeX:read-length "Inter-Columns Rule Width: "))) 5.62 +(defun YaTeX::bottomrule (argp) 5.63 + (if (equal argp 1) (YaTeX:read-length "Bottom Rule Width: "))) 5.64 +(defun YaTeX::addlinespace (argp) 5.65 + (if (equal argp 1) (YaTeX:read-length "Additional Line space: "))) 5.66 +(defun YaTeX::specialrule (argp) 5.67 + (if (equal argp 1) (YaTeX:read-length "Special rule: "))) 5.68 + 5.69 ;;; -------------------- beamer stuff -------------------- 5.70 (defvar YaTeX:frame-option-alist-default 5.71 '(("plain") ("containsverbatim") ("shrink") ("squeeze")
6.1 --- a/yatexlib.el Thu Sep 29 10:00:57 2022 +0900 6.2 +++ b/yatexlib.el Sun Dec 25 14:13:45 2022 +0900 6.3 @@ -1,7 +1,7 @@ 6.4 ;;; yatexlib.el --- YaTeX and yahtml common libraries -*- coding: sjis -*- 6.5 ;;; 6.6 -;;; (c)1994-2019 by HIROSE Yuuji.[yuuji@yatex.org] 6.7 -;;; Last modified Fri Sep 23 06:43:32 2022 on firestorm 6.8 +;;; (c)1994-2022 by HIROSE Yuuji.[yuuji@yatex.org] 6.9 +;;; Last modified Fri Dec 2 08:41:16 2022 on firestorm 6.10 ;;; $Id$ 6.11 6.12 ;;; Code:
7.1 --- a/yatexmth.el Thu Sep 29 10:00:57 2022 +0900 7.2 +++ b/yatexmth.el Sun Dec 25 14:13:45 2022 +0900 7.3 @@ -1,7 +1,7 @@ 7.4 ;;; yatexmth.el --- YaTeX math-mode-specific functions -*- coding: sjis -*- 7.5 ;;; 7.6 -;;; (c)1993-2018 by HIROSE Yuuji [yuuji@yatex.org] 7.7 -;;; Last modified Tue Dec 25 20:02:12 2018 on firestorm 7.8 +;;; (c)1993-2022 by HIROSE Yuuji [yuuji@yatex.org] 7.9 +;;; Last modified Sun Dec 25 13:56:02 2022 on firestorm 7.10 ;;; $Id$ 7.11 7.12 ;;; Commentary: 7.13 @@ -326,6 +326,8 @@ 7.14 ("ms" "mathsf" "\\mathsf{}") 7.15 ("mc" "mathcal" "\\mathcal{}") 7.16 ("mn" "mathnormal" "\\mathnormal{}") 7.17 + ("di" "displaystyle" "\displaystyle") 7.18 + ("ds" "displaystyle" "\displaystyle") 7.19 ) 7.20 "Default LaTeX-math-command alist.") 7.21
8.1 --- a/yatexpkg.el Thu Sep 29 10:00:57 2022 +0900 8.2 +++ b/yatexpkg.el Sun Dec 25 14:13:45 2022 +0900 8.3 @@ -1,7 +1,7 @@ 8.4 ;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*- 8.5 ;;; 8.6 -;;; (c)2003-2019 by HIROSE, Yuuji [yuuji@yatex.org] 8.7 -;;; Last modified Thu Sep 22 20:20:37 2022 on firestorm 8.8 +;;; (c)2003-2022 by HIROSE, Yuuji [yuuji@yatex.org] 8.9 +;;; Last modified Fri Dec 2 08:22:41 2022 on firestorm 8.10 ;;; $Id$ 8.11 8.12 ;;; Code: 8.13 @@ -28,7 +28,8 @@ 8.14 ("alltt" (env "alltt")) 8.15 ("misc" (section "verbfile" "listing")) 8.16 ("verbatim" (section "verbatiminput")) 8.17 - ("eclbkbox" (env "breakbox")) 8.18 + ("boites" (env "breakbox")) 8.19 + ;;("eclbkbox" (env "breakbox")) 8.20 ("supertabular" (env "supertabular")) 8.21 ("tabularx" (env "tabularx")) 8.22 ("amsmath" (env . YaTeX-package-ams-envs) 8.23 @@ -44,6 +45,7 @@ 8.24 ("latexsym" (maketitle "mho" "Join" "Box" "Diamond" "leadsto" 8.25 "sqsubset" "sqsupset" "lhd" "unlhd" "rhd" "unrhd")) 8.26 ("mathrsfs" (section "mathscr")) 8.27 + ("fleqn" (env "nccmath")) 8.28 ("graphicx" (section "includegraphics" 8.29 "rotatebox" "scalebox" "resizebox" "reflectbox") 8.30 (option . YaTeX-package-graphics-driver-alist)) 8.31 @@ -77,6 +79,9 @@ 8.32 ("subfigure" (section "subfigure")) 8.33 ("okumacro" (section "ruby" "kenten")) 8.34 ("colortbl" (section "columncolor" "rowcolor")) 8.35 + ("booktab" (section "toprule" "midrule" "bottomrule" "cmidrule" 8.36 + "addlinespace" "specialrule")) 8.37 + ("pxbase" (section "UI")) 8.38 ) 8.39 "Default package vs. macro list. 8.40 Alists contains '(PACKAGENAME . MACROLIST)
9.1 --- a/yatexprc.el Thu Sep 29 10:00:57 2022 +0900 9.2 +++ b/yatexprc.el Sun Dec 25 14:13:45 2022 +0900 9.3 @@ -1,7 +1,7 @@ 9.4 ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*- 9.5 ;;; 9.6 ;;; (c)1993-2022 by HIROSE Yuuji.[yuuji@yatex.org] 9.7 -;;; Last modified Thu Sep 29 09:56:02 2022 on firestorm 9.8 +;;; Last modified Thu Dec 1 19:13:20 2022 on firestorm 9.9 ;;; $Id$ 9.10 9.11 ;;; Code: 9.12 @@ -184,7 +184,8 @@ 9.13 (ppprop (get 'YaTeX-typeset-process 'ppcmd)) 9.14 (ppcmd (cdr (assq proc ppprop))) 9.15 (bcprop (get 'YaTeX-typeset-process 'bibcmd)) 9.16 - (bibcmd (cdr (assq proc bcprop)))) 9.17 + (bibcmd (cdr (assq proc bcprop))) 9.18 + (useluatex (string-match "lua.*tex" thiscmd))) 9.19 (put 'YaTeX-typeset-process 'ppcmd ;erase ppcmd 9.20 (delq (assq proc ppprop) ppprop)) 9.21 (put 'YaTeX-typeset-process 'bibcmd ;erase bibcmd 9.22 @@ -286,8 +287,14 @@ 9.23 ;; If ppcmd is set and it is a function symbol, 9.24 ;; call it whenever command succeeded or not 9.25 (funcall ppcmd)) 9.26 - ((and ppcmd (string-match "finish" mes)) 9.27 - (insert (format "=======> Success! Calling %s\n" ppcmd)) 9.28 + ((and ppcmd (string-match "finish" mes) 9.29 + ;; It is bad way to detect the necessity of 9.30 + ;; pdf-conversion by seeing typesetter name because 9.31 + ;; new typesetter other than lua(la)tex might come. 9.32 + ;; More reasonable way is to determine by the 9.33 + ;; existence of PDF file. 9.34 + (not useluatex)) 9.35 + (insert (format "=======> Success! Calling %s\n" ppcmd)) 9.36 (setq mode-name ; set process name 9.37 (concat 9.38 mode-name "+"