1.1 --- a/yatexadd.el	Wed Jan 16 08:24:17 2019 +0900
     1.2 +++ b/yatexadd.el	Thu Jan 24 15:19:32 2019 +0900
     1.3 @@ -1,6 +1,6 @@
     1.4  ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*-
     1.5  ;;; (c)1991-2018 by HIROSE Yuuji.[yuuji@yatex.org]
     1.6 -;;; Last modified Wed Jan 16 08:23:13 2019 on firestorm
     1.7 +;;; Last modified Thu Jan 24 13:57:49 2019 on firestorm
     1.8  ;;; $Id$
     1.9  
    1.10  ;;; Code:
    1.11 @@ -2040,8 +2040,7 @@
    1.12  				 (format "%s=%s" s (symbol-value s)))))
    1.13  			 '(width height scale angle)))
    1.14  	   ","))
    1.15 -    (if (string= "" str) ""
    1.16 -      (concat "[" str "]"))))
    1.17 +    (concat "{" str "}")))
    1.18  
    1.19  (defvar YaTeX::get-boundingbox-cmd YaTeX-cmd-gs
    1.20    "Command to get bounding box from PDF files.
    1.21 @@ -2148,34 +2147,11 @@
    1.22     ((= argp 1) (YaTeX-read-string-or-skip "Kanji: ")) 
    1.23     ((= argp 2) (YaTeX-read-string-or-skip "Yomi: "))))
    1.24  
    1.25 -(defvar YaTeX::usepackage-alist-default
    1.26 -  '(("version") ("plext") ("url") ("fancybox") ("pifont") ("longtable")
    1.27 -    ("ascmac") ("bm") ("graphics") ("graphicx") ("alltt") ("misc") ("eclbkbox")
    1.28 -    ("amsmath") ("amssymb") ("xymtex") ("chemist")
    1.29 -    ("a4j") ("array") ("epsf") ("color") ("xcolor") ("epsfig") ("floatfig")
    1.30 -    ("landscape") ("path") ("supertabular") ("twocolumn")
    1.31 -    ("latexsym") ("times") ("makeidx") ("geometry") ("type1cm")
    1.32 -    ("subfigure") ("okumacro"))
    1.33 -  "Default completion table for arguments of \\usepackage")
    1.34 +;;(require 'yatexpkg)
    1.35 +(autoload 'YaTeX::usepackage "yatexpkg" "Add-in for \\usepackage{}")
    1.36 +;;; (defun YaTeX::usepackage()...) MOVED to yatexpkg.el
    1.37 +;;; See yatexpkg.el
    1.38  
    1.39 -(defvar YaTeX::usepackage-alist-private nil
    1.40 -  "*Private completion list of the argument for usepackage")
    1.41 -
    1.42 -(defvar YaTeX::usepackage-alist-local nil
    1.43 -  "Directory local  completion list of the argument for usepackage")
    1.44 -
    1.45 -(defun YaTeX::usepackage (&optional argp)
    1.46 -  (cond
    1.47 -   ((equal argp 1)
    1.48 -    (setq YaTeX-env-name "document")
    1.49 -    (let ((minibuffer-local-completion-map YaTeX-minibuffer-completion-map)
    1.50 -	  (delim ","))
    1.51 -      (YaTeX-cplread-with-learning
    1.52 -       (if YaTeX-japan "Use package(カンマで区切ってOK): "
    1.53 -	 "Use package(delimitable by comma): ")
    1.54 -       'YaTeX::usepackage-alist-default
    1.55 -       'YaTeX::usepackage-alist-private
    1.56 -       'YaTeX::usepackage-alist-local)))))
    1.57  
    1.58  (defun YaTeX::mask (argp)
    1.59    (cond