yatex

changeset 311:f1d2753cb4f1 dev

find changesets by author, revision, files, or words in the commit message
Completing read in optional argument reader for `includegraphcis'
author HIROSE Yuuji <yuuji@gentei.org>
date Tue, 24 Dec 2013 09:03:55 +0900
parents b16e6b1cf00b
children 0d42b3d7f958
files yatexadd.el
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/yatexadd.el	Sat Nov 23 01:04:05 2013 +0900
     1.2 +++ b/yatexadd.el	Tue Dec 24 09:03:55 2013 +0900
     1.3 @@ -1,7 +1,7 @@
     1.4  ;;; yatexadd.el --- YaTeX add-in functions
     1.5  ;;; yatexadd.el rev.20
     1.6  ;;; (c)1991-2013 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Thu Nov 21 15:50:56 2013 on firestorm
     1.8 +;;; Last modified Tue Dec 24 08:53:15 2013 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;;; Code:
    1.12 @@ -1902,9 +1902,13 @@
    1.13  
    1.14  (defun YaTeX:includegraphics ()
    1.15    "Add-in for \\includegraphics's option"
    1.16 -  (let (width height (scale "") angle str)
    1.17 -    (setq width (YaTeX-read-string-or-skip "Width: ")
    1.18 -	  height (YaTeX-read-string-or-skip "Height: "))
    1.19 +  (let (width height (scale "") angle str (delim "-0-9*+/.")
    1.20 +	(minibuffer-local-completion-map YaTeX-minibuffer-completion-map)
    1.21 +	(tbl (append YaTeX:style-parameters-local
    1.22 +		     YaTeX:style-parameters-private
    1.23 +		     YaTeX:style-parameters-default)))
    1.24 +    (setq width (YaTeX-completing-read-or-skip "Width: " tbl nil)
    1.25 +	  height (YaTeX-completing-read-or-skip "Height: " tbl nil))
    1.26      (or (string< "" width) (string< "" height)
    1.27  	(setq scale (YaTeX-read-string-or-skip "Scale: ")))
    1.28      (setq angle (YaTeX-read-string-or-skip "Angle(0-359): "))
    1.29 @@ -2001,7 +2005,7 @@
    1.30      ("amsmath") ("amssymb") ("xymtex") ("chemist")
    1.31      ("a4j") ("array") ("epsf") ("color") ("xcolor") ("epsfig") ("floatfig")
    1.32      ("landscape") ("path") ("supertabular") ("twocolumn")
    1.33 -    ("latexsym") ("times") ("makeidx"))
    1.34 +    ("latexsym") ("times") ("makeidx") ("geometry") ("type1cm"))
    1.35    "Default completion table for arguments of \\usepackage")
    1.36  
    1.37  (defvar YaTeX::usepackage-alist-private nil