Mercurial > hgrepos > hgweb.cgi > yatex
changeset 610:dd4ed4c255c7 draft dev
Merged with devel
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Sun, 25 Dec 2022 14:24:43 +0900 |
| parents | 923a6c0183be (current diff) c1b39bbfcf34 (diff) |
| children | e87c3271b8fd |
| files | |
| diffstat | 9 files changed, 81 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 29 10:23:48 2022 +0900 +++ b/.hgtags Sun Dec 25 14:24:43 2022 +0900 @@ -22,3 +22,4 @@ ca7cf34e959cc35960081f25b0f903b1bd2a191f master-beginning fbb636ff0fe3fd784af7697db5805a20d33b04d2 yatex-1.81 4dad5f91b26cb44a8caa888fe8aa0aad1f1f10bb yatex-1.82 +157aa7974191bbb4707d26b05ce830282ad70ef5 yatex-1.83
--- a/yahtml.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yahtml.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,8 +1,8 @@ ;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*- -;;; (c) 1994-2019 by HIROSE Yuuji [yuuji(@)yatex.org] +;;; (c) 1994-2022 by HIROSE Yuuji [yuuji(@)yatex.org] ;;; $Id$ -(defconst yahtml-revision-number "1.80.1" +(defconst yahtml-revision-number "1.83" "Revision number of running yahtml.el") ;;; Commentary: @@ -1185,7 +1185,7 @@ (defvar yahtml-link-types-alist '(("alternate") ("stylesheet") ("start") ("next") ("prev") ("contents") ("index") ("glossary") ("chapter") ("section") - ("subsection") ("appendix") ("help") ("bookmark"))) + ("subsection") ("appendix") ("help") ("bookmark") ("manifest"))) (defvar yahtml-content-types-alist '(("text/css") ("text/html") ("text/plain") ("text/richtext") @@ -1481,7 +1481,9 @@ (defvar yahtml-input-types '(("text") ("password") ("checkbox") ("radio") ("submit") - ("reset") ("image") ("hidden") ("file"))) + ("reset") ("image") ("hidden") ("file") + ("date") ("time") ("datetime-local") ("week") ("number") ("tel") + ("range") ("color"))) (defun yahtml:input () "Add-in function for `input' form" @@ -1502,6 +1504,13 @@ (yahtml-make-optional-argument "value" value) (yahtml-make-optional-argument "id" id) (yahtml-make-optional-argument "size" size) + (if (string-match "range" type) + (concat (yahtml-make-optional-argument + "min" (YaTeX-read-string-or-skip "min: ")) + (yahtml-make-optional-argument + "max" (YaTeX-read-string-or-skip "max: ")) + (yahtml-make-optional-argument + "step" (YaTeX-read-string-or-skip "step: ")))) (yahtml-make-optional-argument "maxlength" maxlength)))) (defun yahtml:datalist () @@ -1620,7 +1629,7 @@ (concat (yahtml-make-optional-argument "rel" rel) (yahtml-make-optional-argument - "type" (yahtml-read-parameter "type" "text/css")) + "type" (yahtml-read-parameter "type")) (yahtml-make-optional-argument "href" (read-from-minibuffer-with-history
--- a/yatex.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatex.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,6 +1,6 @@ ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*- -;;; (c)1991-2020 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Thu Sep 29 10:22:07 2022 on firestorm +;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org] +;;; Last modified Sun Dec 25 13:57:49 2022 on firestorm ;;; $Id$ ;;; The latest version of this software is always available at; ;;; https://www.yatex.org/ @@ -16,7 +16,7 @@ ;;; Code: (require 'yatexlib) -(defconst YaTeX-revision-number "1.82.1" +(defconst YaTeX-revision-number "1.83" "Revision number of running yatex.el") ;---------- Local variables ---------- @@ -362,7 +362,8 @@ (defvar YaTeX-ams-math-begin-alist '(("align") ("align*") ("multline") ("multline*") ("gather") ("gather*") ("alignat") ("alignat*") ("xalignat") ("xalignat*") - ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*"))) + ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*") + ("fleqn"))) (defvar YaTeX-ams-math-gathering-alist '(("matrix") ("pmatrix") ("bmatrix") ("Bmatrix") ("vmatrix") ("Vmatrix") ("split") ("split*") ("aligned") ("aligned*") ("alignedat") ("gathered")
--- a/yatex.new Thu Sep 29 10:23:48 2022 +0900 +++ b/yatex.new Sun Dec 25 14:24:43 2022 +0900 @@ -1,6 +1,18 @@ What's new in YaTeX/yahtml 野鳥/yahtml - 各バージョンの変更点について +1.83 == yatex == + Evince-dbus連携見直し(Thanks to TeX Wiki)。 + latex-message-kanji-code 0 でプロセスコード 'undicided にしてみた。 + LuaTeX等で直接PDFが出されたときにはdvipdfmx省略。 + uplatex関連のものなどをいくつか追加。 + ;di で \displaystyle 補完。 + Dbusでのevince-reverse-search実験実装。 + アドイン追加: wraptable, spacing, tablecolor + 補完追加: fleqn + == yahtml == + デフォルトテーブルHTML5 + 1.82 == yatex == YaTeX::usepackage-alist-default を廃止し、 YaTeX-package-alist-default を利用するようにした。
--- a/yatexadd.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatexadd.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,6 +1,6 @@ ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*- -;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Thu Sep 22 11:41:04 2022 on firestorm +;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org] +;;; Last modified Fri Dec 2 08:40:27 2022 on firestorm ;;; $Id$ ;;; Code: @@ -1855,6 +1855,7 @@ ("oneside") ("twoside") ("draft") ("final") ("leqno") ("fleqn") ("openbib") ("tombow") ("titlepage") ("notitlepage") ("dvips") ("mingoth") ;for jsarticle + ("uplatex") ;for uplatex ("clock") ;for slides class only ) "Default options list for documentclass") @@ -1892,7 +1893,9 @@ (defvar YaTeX:documentclasses-default '(("article") ("jarticle") ("report") ("jreport") ("book") ("jbook") - ("jsarticle") ("jsbook") + ("ltjsarticle") ("ltjsreport") ("ltjsbook") + ("ltjarticle") ("ltjreport") ("ltjbook") + ("jsarticle") ("jsreport") ("jsbook") ("j-article") ("j-report") ("j-book") ("letter") ("slides") ("ltxdoc") ("ltxguide") ("ltnews") ("proc")) "Default documentclass alist") @@ -2098,7 +2101,8 @@ (if (string= "" str) "" (concat "[" str "]")))) -(defvar YaTeX::get-boundingbox-cmd YaTeX-cmd-gs +(defvar YaTeX::get-boundingbox-cmd + (or (YaTeX-executable-find "extractbb") YaTeX-cmd-gs) "Command to get bounding box from PDF files. Possible values are `gs' and `extractbb'.") @@ -2132,7 +2136,7 @@ (or (fboundp 'yahtml-get-image-info) (progn (load "yahtml" t) (featurep 'yahtml))) ;(require 'yahtml nil t) - (if (string-match "\\.pdf" imgfile) + (if (string-match "\\.\\(pdf\\|png\\)" imgfile) (and (setq info (YaTeX::get-boundingbox imgfilepath)) (stringp info) @@ -2250,6 +2254,21 @@ ((memq c '(?c ?C)) (setq left "{\\scriptsize " right "}"))) (format "%s%s%s" left char right))))) + +;;; -------------------- booktab staff -------------------- +(defun YaTeX::toprule (argp) + (if (equal argp 1) (YaTeX:read-length "Top Rule Width: "))) +(defun YaTeX::midrule (argp) + (if (equal argp 1) (YaTeX:read-length "Middle Rule Width: "))) +(defun YaTeX::cmidrule (argp) + (if (equal argp 1) (YaTeX:read-length "Inter-Columns Rule Width: "))) +(defun YaTeX::bottomrule (argp) + (if (equal argp 1) (YaTeX:read-length "Bottom Rule Width: "))) +(defun YaTeX::addlinespace (argp) + (if (equal argp 1) (YaTeX:read-length "Additional Line space: "))) +(defun YaTeX::specialrule (argp) + (if (equal argp 1) (YaTeX:read-length "Special rule: "))) + ;;; -------------------- beamer stuff -------------------- (defvar YaTeX:frame-option-alist-default '(("plain") ("containsverbatim") ("shrink") ("squeeze")
--- a/yatexlib.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatexlib.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,7 +1,7 @@ ;;; yatexlib.el --- YaTeX and yahtml common libraries -*- coding: sjis -*- ;;; -;;; (c)1994-2019 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Fri Sep 23 06:43:32 2022 on firestorm +;;; (c)1994-2022 by HIROSE Yuuji.[yuuji@yatex.org] +;;; Last modified Fri Dec 2 08:41:16 2022 on firestorm ;;; $Id$ ;;; Code:
--- a/yatexmth.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatexmth.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,7 +1,7 @@ ;;; yatexmth.el --- YaTeX math-mode-specific functions -*- coding: sjis -*- ;;; -;;; (c)1993-2018 by HIROSE Yuuji [yuuji@yatex.org] -;;; Last modified Tue Dec 25 20:02:12 2018 on firestorm +;;; (c)1993-2022 by HIROSE Yuuji [yuuji@yatex.org] +;;; Last modified Sun Dec 25 13:56:02 2022 on firestorm ;;; $Id$ ;;; Commentary: @@ -326,6 +326,8 @@ ("ms" "mathsf" "\\mathsf{}") ("mc" "mathcal" "\\mathcal{}") ("mn" "mathnormal" "\\mathnormal{}") + ("di" "displaystyle" "\displaystyle") + ("ds" "displaystyle" "\displaystyle") ) "Default LaTeX-math-command alist.")
--- a/yatexpkg.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatexpkg.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,7 +1,7 @@ ;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*- ;;; -;;; (c)2003-2019 by HIROSE, Yuuji [yuuji@yatex.org] -;;; Last modified Thu Sep 22 20:20:37 2022 on firestorm +;;; (c)2003-2022 by HIROSE, Yuuji [yuuji@yatex.org] +;;; Last modified Fri Dec 2 08:22:41 2022 on firestorm ;;; $Id$ ;;; Code: @@ -28,7 +28,8 @@ ("alltt" (env "alltt")) ("misc" (section "verbfile" "listing")) ("verbatim" (section "verbatiminput")) - ("eclbkbox" (env "breakbox")) + ("boites" (env "breakbox")) + ;;("eclbkbox" (env "breakbox")) ("supertabular" (env "supertabular")) ("tabularx" (env "tabularx")) ("amsmath" (env . YaTeX-package-ams-envs) @@ -44,6 +45,7 @@ ("latexsym" (maketitle "mho" "Join" "Box" "Diamond" "leadsto" "sqsubset" "sqsupset" "lhd" "unlhd" "rhd" "unrhd")) ("mathrsfs" (section "mathscr")) + ("fleqn" (env "nccmath")) ("graphicx" (section "includegraphics" "rotatebox" "scalebox" "resizebox" "reflectbox") (option . YaTeX-package-graphics-driver-alist)) @@ -77,6 +79,9 @@ ("subfigure" (section "subfigure")) ("okumacro" (section "ruby" "kenten")) ("colortbl" (section "columncolor" "rowcolor")) + ("booktab" (section "toprule" "midrule" "bottomrule" "cmidrule" + "addlinespace" "specialrule")) + ("pxbase" (section "UI")) ) "Default package vs. macro list. Alists contains '(PACKAGENAME . MACROLIST)
--- a/yatexprc.el Thu Sep 29 10:23:48 2022 +0900 +++ b/yatexprc.el Sun Dec 25 14:24:43 2022 +0900 @@ -1,7 +1,7 @@ ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*- ;;; ;;; (c)1993-2022 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Thu Sep 29 09:56:02 2022 on firestorm +;;; Last modified Thu Dec 1 19:13:20 2022 on firestorm ;;; $Id$ ;;; Code: @@ -184,7 +184,8 @@ (ppprop (get 'YaTeX-typeset-process 'ppcmd)) (ppcmd (cdr (assq proc ppprop))) (bcprop (get 'YaTeX-typeset-process 'bibcmd)) - (bibcmd (cdr (assq proc bcprop)))) + (bibcmd (cdr (assq proc bcprop))) + (useluatex (string-match "lua.*tex" thiscmd))) (put 'YaTeX-typeset-process 'ppcmd ;erase ppcmd (delq (assq proc ppprop) ppprop)) (put 'YaTeX-typeset-process 'bibcmd ;erase bibcmd @@ -286,8 +287,14 @@ ;; If ppcmd is set and it is a function symbol, ;; call it whenever command succeeded or not (funcall ppcmd)) - ((and ppcmd (string-match "finish" mes)) - (insert (format "=======> Success! Calling %s\n" ppcmd)) + ((and ppcmd (string-match "finish" mes) + ;; It is bad way to detect the necessity of + ;; pdf-conversion by seeing typesetter name because + ;; new typesetter other than lua(la)tex might come. + ;; More reasonable way is to determine by the + ;; existence of PDF file. + (not useluatex)) + (insert (format "=======> Success! Calling %s\n" ppcmd)) (setq mode-name ; set process name (concat mode-name "+"
