Mercurial > hgrepos > hgweb.cgi > yatex
changeset 560:637d152145d7
merged with dev
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Wed, 26 Dec 2018 08:11:24 +0900 |
parents | 1ea3d99132fb (current diff) 3f5ce5a755c4 (diff) |
children | 70bb775b481c |
files | .hgtags |
diffstat | 7 files changed, 40 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 31 08:22:31 2018 +0900 +++ b/.hgtags Wed Dec 26 08:11:24 2018 +0900 @@ -20,3 +20,4 @@ 0e37ced833ef9388295be594da9bc91ff6eae037 yatex-1.80 a2bb2426a15410438d5e5917ce939bd4bbbe8194 yatex-1.80 ca7cf34e959cc35960081f25b0f903b1bd2a191f master-beginning +fbb636ff0fe3fd784af7697db5805a20d33b04d2 yatex-1.81
--- a/yahtml.el Tue Jul 31 08:22:31 2018 +0900 +++ b/yahtml.el Wed Dec 26 08:11:24 2018 +0900 @@ -1623,7 +1623,8 @@ (defvar yahtml:meta-attrs '(("charset" value) - ("name" content ("keywords")("author")("copyright")("date")("GENERATOR")) + ("name" content ("keywords")("author")("copyright")("date")("GENERATOR") + ("viewport")) ("http-equiv" content))) (defun yahtml:meta () @@ -1665,6 +1666,9 @@ (error "Use <meta charset=\"...\" instead.. See docs/qanda.") (yahtml-make-optional-argument "content" (yahtml-read-parameter "content")))) + ((string-match "viewport" name) + ;; XXX: Very dirty static string + "width=device-width, initial-scale=1") (t (read-string-with-history (concat name ": "))))))) (t (yahtml-make-optional-argument attr (yahtml-read-parameter attr))))))
--- a/yatex.el Tue Jul 31 08:22:31 2018 +0900 +++ b/yatex.el Wed Dec 26 08:11:24 2018 +0900 @@ -1,6 +1,6 @@ ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*- ;;; (c)1991-2018 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Sat Jun 2 14:13:17 2018 on firestorm +;;; Last modified Tue Dec 25 20:03:02 2018 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.80.3" +(defconst YaTeX-revision-number "1.81.1" "Revision number of running yatex.el") ;---------- Local variables ---------- @@ -323,8 +323,9 @@ ("mathscr") ("mathrsfs") ;;cleveref ("cref") ("crefrange") ("cpageref") ("labelcref") ("labelcpageref") - ;; beamer - ("frametitle") ("framesubtitle") + ("frametitle") ("framesubtitle") ;; beamer + ("subfigure") ;; subfigure + ("ruby" 2) ("kenten") ;; okumacro ) (if YaTeX-use-LaTeX2e '(("documentclass") ("usepackage")
--- a/yatex.new Tue Jul 31 08:22:31 2018 +0900 +++ b/yatex.new Wed Dec 26 08:11:24 2018 +0900 @@ -5,6 +5,10 @@ == yatex == タイプセットコマンド定義中の %k を漢字コード名に変換(-kanji=%k) ドット環境で外部フィルタを自動起動する機能を追加。 + graphiz, blockdiagの変換結果も on-the-fly 表示。 + subfigure, bibliographystyle, includesvg補完。 + == yahtml == + meta要素で view-port を入れやすく。 1.80 string-to-int除外と同時に emacs-18 をサポート外に。 2-Clause BSDでもOKという風に書いてみた。
--- a/yatexadd.el Tue Jul 31 08:22:31 2018 +0900 +++ b/yatexadd.el Wed Dec 26 08:11:24 2018 +0900 @@ -1,6 +1,6 @@ ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*- ;;; (c)1991-2018 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Wed May 30 13:35:42 2018 on firestorm +;;; Last modified Wed Nov 7 09:01:08 2018 on firestorm ;;; $Id$ ;;; Code: @@ -2133,6 +2133,20 @@ (setq YaTeX-section-name "label") nil) +(defun YaTeX:subfigure () + (let ((subcap (YaTeX-read-string-or-skip "Sub-caption: "))) + (if (string= "" subcap) "" + (concat "[" subcap "]")))) + +(defun YaTeX::subfigure (argp) + (setq YaTeX-section-name "includegraphics") + nil) + +;; for okumacro +(defun YaTeX::ruby (argp) + (cond + ((= argp 1) (YaTeX-read-string-or-skip "Kanji: ")) + ((= argp 2) (YaTeX-read-string-or-skip "Yomi: ")))) (defvar YaTeX::usepackage-alist-default '(("version") ("plext") ("url") ("fancybox") ("pifont") ("longtable") @@ -2140,7 +2154,8 @@ ("amsmath") ("amssymb") ("xymtex") ("chemist") ("a4j") ("array") ("epsf") ("color") ("xcolor") ("epsfig") ("floatfig") ("landscape") ("path") ("supertabular") ("twocolumn") - ("latexsym") ("times") ("makeidx") ("geometry") ("type1cm")) + ("latexsym") ("times") ("makeidx") ("geometry") ("type1cm") + ("subfigure") ("okumacro")) "Default completion table for arguments of \\usepackage") (defvar YaTeX::usepackage-alist-private nil
--- a/yatexmth.el Tue Jul 31 08:22:31 2018 +0900 +++ b/yatexmth.el Wed Dec 26 08:11:24 2018 +0900 @@ -1,7 +1,7 @@ ;;; yatexmth.el --- YaTeX math-mode-specific functions -*- coding: sjis -*- ;;; -;;; (c)1993-2017 by HIROSE Yuuji [yuuji@yatex.org] -;;; Last modified Sat Feb 24 16:40:22 2018 on firestorm +;;; (c)1993-2018 by HIROSE Yuuji [yuuji@yatex.org] +;;; Last modified Tue Dec 25 20:02:12 2018 on firestorm ;;; $Id$ ;;; Commentary: @@ -1014,7 +1014,7 @@ (t (delete-region (- (point) length) (- (point) paren-length)) (backward-char paren-length))) - (insert-string newsize) + (insert newsize) (if big-p (insert ?l)) (unwind-protect (progn @@ -1029,7 +1029,7 @@ (t (delete-region (- (point) length) (- (point) paren-length)) (backward-char paren-length) - (insert-string newsize) + (insert newsize) (if big-p (insert ?r)) (forward-char paren-length))) (if (string= lr "l") (backward-list)))
--- a/yatexpkg.el Tue Jul 31 08:22:31 2018 +0900 +++ b/yatexpkg.el Wed Dec 26 08:11:24 2018 +0900 @@ -1,7 +1,7 @@ ;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*- ;;; ;;; (c)2003-2018 by HIROSE, Yuuji [yuuji@yatex.org] -;;; Last modified Fri Jan 5 00:22:46 2018 on firestorm +;;; Last modified Wed Nov 7 08:57:36 2018 on firestorm ;;; $Id$ ;;; Code: @@ -57,6 +57,8 @@ ("wrapfig" (env "wrapfigure" "wraptable")) ("setspace" (env "spacing") (section "setstretch")) ("cases" (env "numcases" "subnumcases")) + ("subfigure" (section "subfigure")) + ("okumacro" (section "ruby" "kenten")) ) "Default package vs. macro list. Alists contains '(PACKAGENAME . MACROLIST) @@ -75,7 +77,7 @@ ("xdvi") ("dvipdfmx") ("pdftex") ("dvipsone") ("dviwindo") ("emtex") ("dviwin") ("oztex") ("textures") ("pctexps") ("pctexwin") ("pctexhp") ("pctex32") ("truetex") ("tcidvi") ("vtex")) - "Drivers alist of graphics/color stylefile's supporting deveces. + "Drivers alist of graphics/color stylefile's supporting devices. This list is taken from %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 David Carlisle