[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 0c2cfc8238841b64f701d
|
From: |
Davide G. M. Salvetti |
|
Subject: |
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 0c2cfc8238841b64f701db44262389873552cfc6 |
|
Date: |
Mon, 10 Nov 2014 17:28:47 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".
The branch, master has been updated
via 0c2cfc8238841b64f701db44262389873552cfc6 (commit)
from c72f8a8fa01fc3942d606ac425325181230bedb0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0c2cfc8238841b64f701db44262389873552cfc6
Author: Davide G. M. Salvetti <address@hidden>
Date: Mon Nov 3 16:35:07 2014 +0100
Replace `read-string' with `TeX-read-string'
Rationale: `TeX-read-string' inherits current input method, that users may
easily toggle with "C-\" if needed.
diff --git a/context.el b/context.el
index f871c6b..30b670e 100644
--- a/context.el
+++ b/context.el
@@ -523,7 +523,7 @@ the name of the sectioning command inserted with
`\\[ConTeXt-section]'."
"Hook to prompt for ConTeXt section title.
Insert this hook into `ConTeXt-(un)numbered-section-hook' to allow the user to
change
the title of the section inserted with `\\[ConTeXt-section]."
- (setq title (read-string "What title: ")))
+ (setq title (TeX-read-string "What title: ")))
(defun ConTeXt-section-section ()
"Hook to insert ConTeXt section command into the file.
diff --git a/latex.el b/latex.el
index d89c793..7dfbb01 100644
--- a/latex.el
+++ b/latex.el
@@ -452,7 +452,7 @@ the name of the sectioning command inserted with
`\\[LaTeX-section]'."
"Hook to prompt for LaTeX section title.
Insert this hook into `LaTeX-section-hook' to allow the user to change
the title of the section inserted with `\\[LaTeX-section]."
- (setq title (read-string "Title: " title))
+ (setq title (TeX-read-string "Title: " title))
(let ((region (and (TeX-active-mark)
(cons (region-beginning) (region-end)))))
(when region (delete-region (car region) (cdr region)))))
@@ -461,7 +461,7 @@ the title of the section inserted with `\\[LaTeX-section]."
"Hook to prompt for the LaTeX section entry in the table of content .
Insert this hook into `LaTeX-section-hook' to allow the user to insert
a different entry for the section in the table of content."
- (setq toc (read-string "Toc Entry: "))
+ (setq toc (TeX-read-string "Toc Entry: "))
(if (zerop (length toc))
(setq toc nil)))
@@ -597,7 +597,7 @@ It may be customized with the following variables:
(dolist (elt prompts)
(let* ((optional (vectorp elt))
(elt (if optional (elt elt 0) elt))
- (arg (read-string (concat (when optional "(Optional) ")
+ (arg (TeX-read-string (concat (when optional "(Optional)
")
elt ": "))))
(setq args (concat args
(cond ((and optional (> (length arg) 0))
@@ -983,8 +983,8 @@ transfer the job to this function."
"Create ENVIRONMENT with \\caption and \\label commands."
(let ((float (and LaTeX-float ; LaTeX-float can be nil, i.e.
; do not prompt
- (read-string "(Optional) Float position: " LaTeX-float)))
- (caption (read-string "Caption: "))
+ (TeX-read-string "(Optional) Float position: "
LaTeX-float)))
+ (caption (TeX-read-string "Caption: "))
(center (y-or-n-p "Center? "))
(active-mark (and (TeX-active-mark)
(not (eq (mark) (point)))))
@@ -1050,8 +1050,8 @@ transfer the job to this function."
Just like array and tabular."
(let ((pos (and LaTeX-default-position ; LaTeX-default-position can
; be nil, i.e. do not prompt
- (read-string "(Optional) Position: " LaTeX-default-position)))
- (fmt (read-string "Format: " LaTeX-default-format)))
+ (TeX-read-string "(Optional) Position: "
LaTeX-default-position)))
+ (fmt (TeX-read-string "Format: " LaTeX-default-format)))
(setq LaTeX-default-position pos)
(setq LaTeX-default-format fmt)
(LaTeX-insert-environment environment
@@ -1070,7 +1070,7 @@ Just like array and tabular."
(defun LaTeX-env-list (environment)
"Insert ENVIRONMENT and the first item."
- (let ((label (read-string "Default Label: ")))
+ (let ((label (TeX-read-string "Default Label: ")))
(LaTeX-insert-environment environment
(format "{%s}{}" label))
(end-of-line 0)
@@ -1082,8 +1082,8 @@ Just like array and tabular."
"Create new LaTeX minipage or minipage-like ENVIRONMENT."
(let ((pos (and LaTeX-default-position ; LaTeX-default-position can
; be nil, i.e. do not prompt
- (read-string "(Optional) Position: " LaTeX-default-position)))
- (width (read-string "Width: " LaTeX-default-width)))
+ (TeX-read-string "(Optional) Position: "
LaTeX-default-position)))
+ (width (TeX-read-string "Width: " LaTeX-default-width)))
(setq LaTeX-default-position pos)
(setq LaTeX-default-width width)
(LaTeX-insert-environment environment
@@ -1094,11 +1094,11 @@ Just like array and tabular."
(defun LaTeX-env-tabular* (environment)
"Insert ENVIRONMENT with width, position and column specifications."
- (let ((width (read-string "Width: " LaTeX-default-width))
+ (let ((width (TeX-read-string "Width: " LaTeX-default-width))
(pos (and LaTeX-default-position ; LaTeX-default-position can
; be nil, i.e. do not prompt
- (read-string "(Optional) Position: " LaTeX-default-position)))
- (fmt (read-string "Format: " LaTeX-default-format)))
+ (TeX-read-string "(Optional) Position: "
LaTeX-default-position)))
+ (fmt (TeX-read-string "Format: " LaTeX-default-format)))
(setq LaTeX-default-width width)
(setq LaTeX-default-position pos)
(setq LaTeX-default-format fmt)
@@ -1112,10 +1112,10 @@ Just like array and tabular."
(defun LaTeX-env-picture (environment)
"Insert ENVIRONMENT with width, height specifications."
- (let ((width (read-string "Width: "))
- (height (read-string "Height: "))
- (x-offset (read-string "X Offset: "))
- (y-offset (read-string "Y Offset: ")))
+ (let ((width (TeX-read-string "Width: "))
+ (height (TeX-read-string "Height: "))
+ (x-offset (TeX-read-string "X Offset: "))
+ (y-offset (TeX-read-string "Y Offset: ")))
(if (zerop (length x-offset))
(setq x-offset "0"))
(if (zerop (length y-offset))
@@ -1131,7 +1131,7 @@ Just like array and tabular."
"Insert ENVIRONMENT with label for bibitem."
(LaTeX-insert-environment environment
(concat TeX-grop
- (read-string "Label for BibItem: " "99")
+ (TeX-read-string "Label for BibItem: " "99")
TeX-grcl))
(end-of-line 0)
(delete-char 1)
@@ -1145,7 +1145,7 @@ Just like array and tabular."
(error "Put %s environment before \\begin{document}" environment)))
(LaTeX-insert-environment environment
(concat TeX-grop
- (read-string "File: ")
+ (TeX-read-string "File: ")
TeX-grcl))
(delete-horizontal-space))
@@ -1741,7 +1741,7 @@ If OPTIONAL is non-nil, insert the resulting value as an
optional
argument, otherwise as a mandatory one. Use PROMPT as the prompt
string. ARGS is unused."
(TeX-argument-insert
- (read-string (TeX-argument-prompt optional prompt "Index tag")) optional))
+ (TeX-read-string (TeX-argument-prompt optional prompt "Index tag"))
optional))
(defun TeX-arg-index (optional &optional prompt &rest args)
"Prompt for an index entry completing with known entries.
@@ -2001,7 +2001,7 @@ OPTIONAL and IGNORE are ignored."
LaTeX-default-options
(mapconcat 'identity LaTeX-default-options
",")))
","))))
- (setq options (read-string "Options: ")))
+ (setq options (TeX-read-string "Options: ")))
(unless (zerop (length options))
(insert LaTeX-optop options LaTeX-optcl)
(let ((opts (LaTeX-listify-package-options options)))
@@ -2065,7 +2065,7 @@ of the options, nil otherwise."
(TeX-completing-read-multiple
"Options: " (mapcar 'list (symbol-value var)))
","))))
- (setq options (read-string "Options: ")))
+ (setq options (TeX-read-string "Options: ")))
(cons packages options))))
(defun LaTeX-arg-usepackage-insert (packages options)
@@ -2351,8 +2351,8 @@ comma.
If OPTIONAL is non-nil, insert the resulting value as an optional
argument, otherwise as a mandatory one."
- (insert "(" (read-string (concat first ": ")) ","
- (read-string (concat second ": ")) ")"))
+ (insert "(" (TeX-read-string (concat first ": ")) ","
+ (TeX-read-string (concat second ": ")) ")"))
(defun TeX-arg-size (optional)
"Insert width and height as a pair.
@@ -2596,7 +2596,7 @@ Insert the given value as a TeX macro argument. If
OPTIONAL is
non-nil, insert it as an optional argument. Use PROMPT as the
prompt string. `LaTeX-default-author' is the initial input."
(let ((author (if LaTeX-default-author
- (read-string
+ (TeX-read-string
(TeX-argument-prompt optional prompt "Author(s)")
(if (symbolp LaTeX-default-author)
(symbol-value LaTeX-default-author)
diff --git a/style/CJK.el b/style/CJK.el
index f21d1a9..c63ceb7 100644
--- a/style/CJK.el
+++ b/style/CJK.el
@@ -1,6 +1,6 @@
;;; CJK.el --- AUCTeX style for the CJK package.
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;; Author: Ralf Angeli <address@hidden>
;; Maintainer: address@hidden
@@ -46,11 +46,11 @@ The function can be used for CJK and CJK* environments."
(LaTeX-insert-environment
env
(concat
- (let ((font-enc (read-string "(Optional) Font encoding: ")))
+ (let ((font-enc (TeX-read-string "(Optional) Font encoding: ")))
(unless (zerop (length font-enc)) (format "[%s]" font-enc)))
(format "{%s}" (completing-read "Encoding: "
(mapcar 'list LaTeX-CJK-enc-list)))
- (format "{%s}" (read-string "Font family: ")))))
+ (format "{%s}" (TeX-read-string "Font family: ")))))
(TeX-add-style-hook
"CJK"
diff --git a/style/amsmath.el b/style/amsmath.el
index 0326561..6daec4e 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -163,15 +163,15 @@
(defun LaTeX-amsmath-env-alignat (env)
"Insert ENV with column number specifications.
Insert suitable number of ampersands also if possible."
- (let ((ncols (read-string "Number of columns: ")))
+ (let ((ncols (TeX-read-string "Number of columns: ")))
(LaTeX-insert-environment env (concat TeX-grop ncols TeX-grcl))
(LaTeX-item-equation-alignat t)))
(defun LaTeX-amsmath-env-alignedat (env)
"Insert ENV with position and column number specifications.
Insert suitable number of ampersands also if possible."
- (let ((where (read-string "(Optional) Vertical position (t or b): "))
- (ncols (read-string "Number of columns: ")))
+ (let ((where (TeX-read-string "(Optional) Vertical position (t or b): "))
+ (ncols (TeX-read-string "Number of columns: ")))
(unless (string= where "")
(setq where (concat LaTeX-optop where LaTeX-optcl)))
(LaTeX-insert-environment env (concat where TeX-grop ncols TeX-grcl))
diff --git a/style/amsthm.el b/style/amsthm.el
index 15cbf3a..57f2315 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -1,6 +1,6 @@
;;; amsthm.el --- Style hook for the AMS-LaTeX amsthm package.
-;; Copyright (C) 1997, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2013, 2014 Free Software Foundation, Inc.
;; Author: Carsten Dominik <address@hidden>
;; Maintainer: address@hidden
@@ -34,7 +34,7 @@
'("proof" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((heading (read-string "(optional) Heading: ")))
+ (let ((heading (TeX-read-string "(optional) Heading: ")))
(if (string= heading "")
""
(format "[%s]" heading))))))
diff --git a/style/beamer.el b/style/beamer.el
index c108f2b..9b18c07 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,6 +1,6 @@
;;; beamer.el --- AUCTeX style for the latex-beamer class
-;; Copyright (C) 2003, 2004, 2005, 2008, 2013 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2008, 2013, 2014 Free Software Foundation
;; Author: Thomas Baumann <address@hidden>
;; Created: 2003-12-20
@@ -87,7 +87,7 @@
'("beamerskipbutton" 1)
'("frame" TeX-arg-beamer-frametitle)
'("frametitle"
- (TeX-arg-eval read-string "Title: " nil
'LaTeX-beamer-frametitle-history))
+ (TeX-arg-eval TeX-read-string "Title: " nil
'LaTeX-beamer-frametitle-history))
'("hyperlink" TeX-arg-beamer-overlay-spec 2)
'("hyperlinkslideprev" TeX-arg-beamer-overlay-spec 1)
'("hyperlinkslidenext" TeX-arg-beamer-overlay-spec 1)
@@ -130,13 +130,13 @@
'("beamerboxesrounded" 1)
'("block" (lambda (env &rest ignore)
(LaTeX-insert-environment
- env (format "{%s}" (read-string "Title: ")))))
+ env (format "{%s}" (TeX-read-string "Title: ")))))
'("column" "Width")
"columns"
"columnsonlytextwidth"
'("exampleblock" 1)
'("frame" (lambda (env &rest ignore)
- (let ((title (read-string "(Optional) Title: " nil
+ (let ((title (TeX-read-string "(Optional) Title: " nil
'LaTeX-beamer-frametitle-history)))
(LaTeX-insert-environment env)
(unless (zerop (length title))
@@ -152,14 +152,14 @@
'("onlyenv" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((overlay (read-string "(Optional) Overlay: ")))
+ (let ((overlay (TeX-read-string "(Optional) Overlay: ")))
(unless (zerop (length overlay))
(format "<%s>" overlay))))))
'("overlayarea" "Area width" "Area height")
'("overprint" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((width (read-string "(Optional) Area width: ")))
+ (let ((width (TeX-read-string "(Optional) Area width: ")))
(unless (zerop (length width))
(format "[%s]" width))))))
"semiverbatim")
@@ -192,14 +192,14 @@
(defun TeX-arg-beamer-overlay-spec (optional &optional prompt)
"Prompt for overlay specification."
- (let ((overlay (read-string "(Optional) Overlay: ")))
+ (let ((overlay (TeX-read-string "(Optional) Overlay: ")))
(unless (zerop (length overlay))
(insert "<" overlay ">"))
(indent-according-to-mode)))
(defun TeX-arg-beamer-frametitle (optional &optional prompt)
"Prompt for the frametitle."
- (let ((title (read-string "Title: " nil 'LaTeX-beamer-frametitle-history)))
+ (let ((title (TeX-read-string "Title: " nil
'LaTeX-beamer-frametitle-history)))
(if (not (zerop (length title)))
(insert TeX-grop TeX-esc "frametitle" TeX-grop
title TeX-grcl TeX-grcl)
@@ -223,8 +223,8 @@ unconditionally."
(defun TeX-arg-beamer-note (optional &optional prompt)
"Prompt for overlay specification and optional argument."
- (let ((overlay (read-string "(Optional) Overlay: "))
- (options (read-string "(Optional) Options: ")))
+ (let ((overlay (TeX-read-string "(Optional) Overlay: "))
+ (options (TeX-read-string "(Optional) Options: ")))
(unless (zerop (length overlay))
(insert "<" overlay ">"))
(unless (zerop (length options))
diff --git a/style/csquotes.el b/style/csquotes.el
index fd112f8..e4b156d 100644
--- a/style/csquotes.el
+++ b/style/csquotes.el
@@ -1,6 +1,6 @@
;;; csquotes.el --- AUCTeX style for `csquotes.sty'
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2014 Free Software Foundation, Inc.
;; Author: Ralf Angeli <address@hidden>
;; Maintainer: address@hidden
@@ -57,7 +57,7 @@ the insertion of optional arguments."
optional t)
(setq prompt elt
optional nil))
- (setq user-input (read-string (TeX-argument-prompt optional prompt nil)))
+ (setq user-input (TeX-read-string (TeX-argument-prompt optional prompt
nil)))
(unless (and optional (zerop (length user-input)))
(setq env-extra (concat env-extra
(if optional LaTeX-optop TeX-grop)
diff --git a/style/dinbrief.el b/style/dinbrief.el
index cb9fb6b..ad88905 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 1994, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2013, 2014 Free Software Foundation, Inc.
;; Author: Werner Fink <address@hidden>
;; Maintainer: address@hidden
@@ -94,18 +94,18 @@
"Insert ENVIRONMENT and prompt for recipient and address."
(let (
(sender (LaTeX-dinbrief-sender))
- (recipient (read-string "Empfänger: "))
+ (recipient (TeX-read-string "Empfänger: "))
(address (LaTeX-dinbrief-recipient))
- (date (read-string "Datum: " (LaTeX-dinbrief-today)))
- (postremark (read-string "Postvermerk: "))
- (fenster (read-string "Fenster \(ja/nein\): "))
- (vermerk (read-string "Behandlungsvermerk: "))
- (verteil (read-string "Verteiler: "))
- (betreff (read-string "Betreff: "))
- (opening (read-string "Anrede: "))
- (closing (read-string "Schluss: "))
- (signature (read-string "Unterschrift: "))
- (anlage (read-string "Anlagen: ")))
+ (date (TeX-read-string "Datum: " (LaTeX-dinbrief-today)))
+ (postremark (TeX-read-string "Postvermerk: "))
+ (fenster (TeX-read-string "Fenster \(ja/nein\): "))
+ (vermerk (TeX-read-string "Behandlungsvermerk: "))
+ (verteil (TeX-read-string "Verteiler: "))
+ (betreff (TeX-read-string "Betreff: "))
+ (opening (TeX-read-string "Anrede: "))
+ (closing (TeX-read-string "Schluss: "))
+ (signature (TeX-read-string "Unterschrift: "))
+ (anlage (TeX-read-string "Anlagen: ")))
(if (string= fenster "ja")
(progn
@@ -117,7 +117,7 @@
(newline-and-indent)
(LaTeX-dinbrief-insert TeX-esc "windowtics")
(newline-and-indent)
- (let ((retouradr (read-string "Retouradresse: " sender)))
+ (let ((retouradr (TeX-read-string "Retouradresse: " sender)))
(newline-and-indent)
(if (not (zerop (length retouradr)))
(progn
@@ -206,9 +206,9 @@
(defun LaTeX-dinbrief-sender ()
"Read and write the senders address."
(interactive)
- (let ((name (read-string "Absender: " (user-full-name)))
- (str (read-string "Meine Strasse: "))
- (ort (read-string "Mein Wohnort: ")))
+ (let ((name (TeX-read-string "Absender: " (user-full-name)))
+ (str (TeX-read-string "Meine Strasse: "))
+ (ort (TeX-read-string "Mein Wohnort: ")))
(if (not (zerop (length name)))
(progn
(goto-char (point-min)) ; insert before \end{document}
@@ -233,8 +233,8 @@
(defun LaTeX-dinbrief-recipient ()
"Read and return the recipient address."
(interactive)
- (let ((str (read-string "Wohnhaft in Strasse: "))
- (ort (read-string "Aus der Ortschaft: ")))
+ (let ((str (TeX-read-string "Wohnhaft in Strasse: "))
+ (ort (TeX-read-string "Aus der Ortschaft: ")))
(if (not (zerop (length str)))
(if (not (zerop (length ort)))
(concat str " " TeX-esc TeX-esc " " ort)
@@ -264,7 +264,7 @@
(let ((year (substring ctime-string (match-beginning 3) (match-end 3)))
(month (substring ctime-string (match-beginning 1) (match-end 1)))
(day (substring ctime-string (match-beginning 2) (match-end 2)))
- (place (read-string "Heutiger Ort: ")))
+ (place (TeX-read-string "Heutiger Ort: ")))
(if (assoc month month-alist)
(progn
(setq month (cdr (assoc month month-alist)))
diff --git a/style/dk-bib.el b/style/dk-bib.el
index 2ae7530..63c8d3f 100644
--- a/style/dk-bib.el
+++ b/style/dk-bib.el
@@ -1,6 +1,6 @@
;;; dk-bib.el --- AUCTeX style for `dk-bib.sty'
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2014 Free Software Foundation, Inc.
;; Author: Arne Jørgensen <address@hidden>
;; Keywords: tex
@@ -44,7 +44,7 @@
(> depth 20))
(setq depth (if (fboundp 'read-number)
(read-number "Ordinal depth: ")
- (string-to-number (read-string "Ordinal depth: "))))
+ (string-to-number (TeX-read-string "Ordinal depth: "))))
(when (or (< depth 0)
(> depth 20))
(message "Ordinal depth must be between 0 and 20")
diff --git a/style/emp.el b/style/emp.el
index 16400ee..0401667 100644
--- a/style/emp.el
+++ b/style/emp.el
@@ -1,6 +1,6 @@
;;; emp.el --- AUCTeX support for emp.sty
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2014 Free Software Foundation, Inc.
;; Author: Yvon Henel aka TeXnicien de surface <address@hidden>
;; Maintainer: address@hidden
@@ -44,16 +44,16 @@
(defun LaTeX-env-emp-gen (environment-name)
"Ask for file, width and length. Insert environment-name environment
Used for emp, empdef, and empgraph environments."
- (let ((emp-fig-name (read-string "figure name: " ""))
- (emp-fig-width (read-string "figure width: " "1" ))
- (emp-fig-height (read-string "figure height: " "1" ))
+ (let ((emp-fig-name (TeX-read-string "figure name: " ""))
+ (emp-fig-width (TeX-read-string "figure width: " "1" ))
+ (emp-fig-height (TeX-read-string "figure height: " "1" ))
;;; emp.sty demands a width and a height for each of the
;;; emp, empdef, and empgraph environments
;;; we give them 1 by default
;;; not necessarily the best thing to do?
)
(if (not (zerop (length emp-fig-name)))
- (progn
+ (progn
(setq LaTeX-emp-fig-name (concat LaTeX-optop emp-fig-name
LaTeX-optcl))
(LaTeX-insert-environment environment-name LaTeX-emp-fig-name))
(LaTeX-insert-environment environment-name))
@@ -66,9 +66,9 @@ Used for emp, empdef, and empgraph environments."
(defun LaTeX-env-empfile (optional)
"Ask for file. Insert empfile environment"
- (let ((empfile (read-string "empfile: " "")))
+ (let ((empfile (TeX-read-string "empfile: " "")))
(if (not (zerop (length empfile)))
- (progn
+ (progn
(setq LaTeX-emp-file-name (concat LaTeX-optop empfile LaTeX-optcl))
(setq mpost-emp-file-name (concat empfile ".mp"))
(LaTeX-insert-environment "empfile" LaTeX-emp-file-name))
diff --git a/style/epsf.el b/style/epsf.el
index 797f801..69be611 100644
--- a/style/epsf.el
+++ b/style/epsf.el
@@ -1,8 +1,10 @@
;;; epsf.el - Support for the epsf style option.
;; Contributed by Marc Gemis <address@hidden>
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; FIXME: What about the copyright for <= 2014?
-;;; Code:
+;;; Code:
(TeX-add-style-hook
"epsf"
@@ -20,7 +22,7 @@
(defun TeX-arg-epsfsize (optional &optional prompt definition)
"Create a line that print epsf figures at a certain percentage"
(interactive)
- (let ((scale (read-string "Scale in percent (default 75): ")))
+ (let ((scale (TeX-read-string "Scale in percent (default 75): ")))
(setq scale (if (zerop (length scale)) "75" scale))
(save-excursion
; append #1#{scale#1}
diff --git a/style/filecontents.el b/style/filecontents.el
index ea3c60a..493b6c7 100644
--- a/style/filecontents.el
+++ b/style/filecontents.el
@@ -1,6 +1,6 @@
;;; filecontents.el --- AUCTeX style for `filecontents.sty'
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2014 Free Software Foundation, Inc.
;; Author: Mads Jensen <address@hidden>
;; Maintainer: address@hidden
@@ -45,7 +45,7 @@
"Insert ENVIRONMENT with filename for contents."
(LaTeX-insert-environment environment
(concat TeX-grop
- (read-string "File: ")
+ (TeX-read-string "File: ")
TeX-grcl))
(delete-horizontal-space))
diff --git a/style/foils.el b/style/foils.el
index e3fedd8..a82cfe6 100644
--- a/style/foils.el
+++ b/style/foils.el
@@ -1,5 +1,8 @@
;;; foils.el - Special code for FoilTeX.
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; FIXME: What about the copyright for <= 2014?
+
;;; Code:
(require 'timezone)
@@ -20,7 +23,7 @@
(year (string-to-number (aref date 0)))
(month (string-to-number (aref date 1)))
(day (string-to-number (aref date 2)))
- (title (read-string "Title: ")))
+ (title (TeX-read-string "Title: ")))
(save-excursion
(goto-char (point-max))
(re-search-backward ".begin.document.")
diff --git a/style/graphicx.el b/style/graphicx.el
index a06aabf..7f66e52 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -1,6 +1,6 @@
;;; graphicx.el --- AUCTeX style file for graphicx.sty
-;; Copyright (C) 2000, 2004, 2005 by Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2004, 2005, 2014 by Free Software Foundation, Inc.
;; Author: Ryuichi Arafune <address@hidden>
;; Created: 1999/3/20
@@ -123,19 +123,19 @@ The extent of the optional arguments is determined by the
prefix argument and
(totalheight
(TeX-arg-maybe
'totalheight incl-opts
- '(read-string
+ '(TeX-read-string
(concat "Total Height (" TeX-default-unit-for-image "): "))))
(height
(TeX-arg-maybe
'height incl-opts
;; Either totalheight or height make sense:
'(when (zerop (length totalheight))
- (read-string
+ (TeX-read-string
(concat "Figure height (" TeX-default-unit-for-image "): ")))))
(width
(TeX-arg-maybe
'width incl-opts
- '(read-string
+ '(TeX-read-string
(concat "Figure width (" TeX-default-unit-for-image "): "))))
(scale
(TeX-arg-maybe
@@ -144,22 +144,22 @@ The extent of the optional arguments is determined by the
prefix argument and
'(when (zerop (+ (length totalheight)
(length height)
(length width)))
- (read-string "Scale: "))))
+ (TeX-read-string "Scale: "))))
(angle
(TeX-arg-maybe
'angle incl-opts
- '(read-string "Rotation angle: ")))
+ '(TeX-read-string "Rotation angle: ")))
(origin
(TeX-arg-maybe
'origin incl-opts
- '(read-string
+ '(TeX-read-string
(concat
"Origin (any combination of `lcr' (horizontal) "
"and `tcbB' (vertical)): "))))
(page ;; Not in any table; Only for PDF.
(TeX-arg-maybe
'page incl-opts
- '(read-string "Page: ")))
+ '(TeX-read-string "Page: ")))
(bb
(TeX-arg-maybe
'bb incl-opts
@@ -236,29 +236,29 @@ The extent of the optional arguments is determined by the
prefix argument and
(setq maybe-comma ",")
(setq maybe-left-brace ""))
(when bb
- (setq llx (read-string "Bounding Box lower left x: "))
- (setq lly (read-string "Bounding Box lower left y: "))
- (setq urx (read-string "Bounding Box upper right x: "))
- (setq ury (read-string "Bounding Box upper right y: "))
+ (setq llx (TeX-read-string "Bounding Box lower left x: "))
+ (setq lly (TeX-read-string "Bounding Box lower left y: "))
+ (setq urx (TeX-read-string "Bounding Box upper right x: "))
+ (setq ury (TeX-read-string "Bounding Box upper right y: "))
(insert maybe-left-brace maybe-comma
"bb=" llx " " lly " " urx " " ury)
(setq maybe-comma ",")
(setq maybe-left-brace ""))
;;
(when viewport
- (setq llx (read-string "Viewport lower left x: "))
- (setq lly (read-string "Viewport lower left y: "))
- (setq urx (read-string "Viewport upper right x: "))
- (setq ury (read-string "Viewport upper right y: "))
+ (setq llx (TeX-read-string "Viewport lower left x: "))
+ (setq lly (TeX-read-string "Viewport lower left y: "))
+ (setq urx (TeX-read-string "Viewport upper right x: "))
+ (setq ury (TeX-read-string "Viewport upper right y: "))
(insert maybe-left-brace maybe-comma
"viewport=" llx " " lly " " urx " " ury)
(setq maybe-comma ",")
(setq maybe-left-brace ""))
(when trim
- (setq llx (read-string "Trim lower left x: "))
- (setq lly (read-string "Trim lower left y: "))
- (setq urx (read-string "Trim Upper right x: "))
- (setq ury (read-string "Trim Upper right y: "))
+ (setq llx (TeX-read-string "Trim lower left x: "))
+ (setq lly (TeX-read-string "Trim lower left y: "))
+ (setq urx (TeX-read-string "Trim Upper right x: "))
+ (setq ury (TeX-read-string "Trim Upper right y: "))
(insert maybe-left-brace maybe-comma
"trim=" llx " " lly " " urx " " ury)
(setq maybe-comma ",")
diff --git a/style/inputenc.el b/style/inputenc.el
index 7d00ca7..e496cc6 100644
--- a/style/inputenc.el
+++ b/style/inputenc.el
@@ -1,6 +1,6 @@
;;; inputenc.el --- AUCTeX style for `inputenc.sty'
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2014 Free Software Foundation, Inc.
;; Author: Arne Jørgensen <address@hidden>
;; Keywords: tex
@@ -66,7 +66,7 @@
;; return selected input encoding
selected)))
- (read-string "Input encoding: ")))
+ (TeX-read-string "Input encoding: ")))
(defun LaTeX-arg-inputenc-inputenc (optional)
"Prompt for input encoding."
diff --git a/style/letter.el b/style/letter.el
index d02f8f4..a4a5b38 100644
--- a/style/letter.el
+++ b/style/letter.el
@@ -1,6 +1,6 @@
;;; letter.el - Special code for letter style.
-;; Copyright (C) 1993, 2012, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2012, 2013, 2014 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <address@hidden>
;; Maintainer: address@hidden
@@ -85,15 +85,15 @@
(defun LaTeX-env-recipient (environment)
"Insert ENVIRONMENT and prompt for recipient and address."
- (let ((sender (read-string "Sender: " (user-full-name)))
- (sender-address (read-string "Sender address: "
+ (let ((sender (TeX-read-string "Sender: " (user-full-name)))
+ (sender-address (TeX-read-string "Sender address: "
LaTeX-letter-sender-address))
- (recipient (read-string "Recipient: "))
- (address (read-string "Recipient address: "))
- (signature (read-string "Signature: "))
- (opening (read-string "Opening: "))
- (closing (read-string "Closing: "))
- (date (read-string "Date: " (LaTeX-today))))
+ (recipient (TeX-read-string "Recipient: "))
+ (address (TeX-read-string "Recipient address: "))
+ (signature (TeX-read-string "Signature: "))
+ (opening (TeX-read-string "Opening: "))
+ (closing (TeX-read-string "Closing: "))
+ (date (TeX-read-string "Date: " (LaTeX-today))))
(insert TeX-esc "name" TeX-grop sender TeX-grcl)
(newline-and-indent)
diff --git a/style/longtable.el b/style/longtable.el
index c0c7cf4..353336d 100644
--- a/style/longtable.el
+++ b/style/longtable.el
@@ -36,8 +36,8 @@
'("longtable" (lambda (environment)
(let ((pos (completing-read (TeX-argument-prompt t nil
"Position")
'(("l") ("r") ("c"))))
- (fmt (read-string "Format: " LaTeX-default-format))
- (caption (read-string "Caption: ")))
+ (fmt (TeX-read-string "Format: "
LaTeX-default-format))
+ (caption (TeX-read-string "Caption: ")))
(setq LaTeX-default-format fmt)
(LaTeX-insert-environment environment
(concat
diff --git a/style/mathtools.el b/style/mathtools.el
index ab4065b..04ecc0d 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -1,6 +1,6 @@
;;; mathtools.el --- Style hook for the LaTeX package `mathtools'.
-;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2012, 2014 Free Software Foundation, Inc.
;; Author: Mads Jensen <address@hidden>
;; Created: 2011-02-13
@@ -170,22 +170,22 @@
LaTeX-dialect)
(defun LaTeX-mathtools-env-matrix-starred (env)
- (let ((where (read-string "(optional) Vertical placement of columns: ")))
+ (let ((where (TeX-read-string "(optional) Vertical placement of columns: ")))
(if (string= where "")
(setq where "")
(setq where (concat "[" where "]")))
(LaTeX-insert-environment env where)))
(defun LaTeX-mathtools-env-spreadlines (env)
- (let ((spread (read-string "Spacing between lines: ")))
+ (let ((spread (TeX-read-string "Spacing between lines: ")))
(LaTeX-insert-environment env (concat TeX-grop spread TeX-grcl))
(newline-and-indent)))
;; FIXME: there are probably more subtle ways to support more than one
;; optional argument; please change if this is the case
(defun LaTeX-mathtools-env-multlined (env)
- (let ((pos (read-string "(optional) Position: "))
- (width (read-string "(optional) Width: "))
+ (let ((pos (TeX-read-string "(optional) Position: "))
+ (width (TeX-read-string "(optional) Width: "))
(extra ""))
(if (not (string= pos ""))
(setq pos (concat LaTeX-optop pos LaTeX-optcl))
diff --git a/style/natbib.el b/style/natbib.el
index 522656c..13cf229 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -1,6 +1,6 @@
;;; natbib.el --- Style hook for the natbib package
-;; Copyright (C) 1997, 1998, 2004, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2004, 2007, 2014 Free Software Foundation, Inc.
;; Authors: Berwin Turlach <address@hidden>
;; Carsten Dominik <address@hidden>
@@ -111,9 +111,9 @@
(defun natbib-note-args (optional &optional prompt definition)
"Prompt for two note arguments a natbib citation command."
(if TeX-arg-cite-note-p
- (let* ((pre (read-string
+ (let* ((pre (TeX-read-string
(TeX-argument-prompt optional optional "Pre-note")))
- (post (read-string
+ (post (TeX-read-string
(TeX-argument-prompt optional optional "Post-note"))))
(if (not (string= pre "")) (insert "[" pre "]"))
(if (not (string= post ""))
@@ -123,7 +123,7 @@
(defvar LaTeX-natbib-package-options '("numbers" "super" "authoryear"
"round" "square" "angle" "curly"
- "comma" "colon" "nobibstyle"
+ "comma" "colon" "nobibstyle"
"bibstyle" "openbib" "sectionbib"
"sort" "sort&compress"
"longnamesfirst" "nonamebreak")
diff --git a/style/paralist.el b/style/paralist.el
index e528de4..c9a7072 100644
--- a/style/paralist.el
+++ b/style/paralist.el
@@ -35,7 +35,7 @@
"Insert ENVIRONMENT, an optional label and the first item."
(LaTeX-insert-environment
environment
- (let ((label (read-string "(Optional) Label: ")))
+ (let ((label (TeX-read-string "(Optional) Label: ")))
(concat (unless (zerop (length label))
(format "[%s]" label)))))
(LaTeX-find-matching-begin)
diff --git a/style/plext.el b/style/plext.el
index 9afefc0..30765a7 100644
--- a/style/plext.el
+++ b/style/plext.el
@@ -50,13 +50,13 @@
LaTeX-dialect)
(defun LaTeX-plext-env-array (env)
- (let ((dir (read-string "(Optional) Direction (t or y or z): "))
+ (let ((dir (TeX-read-string "(Optional) Direction (t or y or z): "))
(width (if (string= env "tabular*")
- (read-string "Width: " LaTeX-default-width)))
+ (TeX-read-string "Width: " LaTeX-default-width)))
(pos (and LaTeX-default-position ; LaTeX-default-position can
; be nil, i.e. do not prompt
- (read-string "(Optional) Position: " LaTeX-default-position)))
- (fmt (read-string "Format: " LaTeX-default-format)))
+ (TeX-read-string "(Optional) Position: "
LaTeX-default-position)))
+ (fmt (TeX-read-string "Format: " LaTeX-default-format)))
(unless (zerop (length dir))
(setq dir (concat "<" dir ">")))
(if (string= env "tabular*")
diff --git a/style/prosper.el b/style/prosper.el
index 3b6de6d..92b3bb6 100644
--- a/style/prosper.el
+++ b/style/prosper.el
@@ -1,6 +1,6 @@
;;; prosper.el --- Prosper style file for AUCTeX
-;; Copyright (C) 2001, 2002 by Philip Lord, Nevin Kapur
+;; Copyright (C) 2001, 2002, 2014 by Philip Lord, Nevin Kapur
;; Authors: Phillip Lord<address@hidden>
;; Nevin Kapur <address@hidden>
@@ -138,7 +138,7 @@
(progn
(goto-char (+ 1 (point)))
(insert "%\n")))))
- (let ((title (read-string "Title: ")))
+ (let ((title (TeX-read-string "Title: ")))
(LaTeX-insert-environment "slide" (concat TeX-grop title TeX-grcl))))
diff --git a/style/psfig.el b/style/psfig.el
index cf8954f..10c902b 100644
--- a/style/psfig.el
+++ b/style/psfig.el
@@ -3,6 +3,9 @@
;; Contributed by Marc Gemis <address@hidden>
;; Please direct comments to him.
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; FIXME: What about the copyright for <= 2014?
+
;;; Code:
(TeX-add-style-hook "psfig"
@@ -26,8 +29,8 @@
(defun TeX-arg-psfig (optional)
"Ask for file, width and length. Insert psfig macro"
(let ((psfile (read-file-name "PS-file: " "" "" nil))
- (figwidth (read-string "Figure width: "))
- (figheight (read-string "Figure height: "))
+ (figwidth (TeX-read-string "Figure width: "))
+ (figheight (TeX-read-string "Figure height: "))
)
(insert TeX-grop "figure=" psfile)
@@ -42,13 +45,13 @@
(defun LaTeX-env-psfigure (environment)
"Create with \\label and \\caption and \\psfig commands."
- (let ((float (read-string "Float to: " LaTeX-float))
- (caption (read-string "Caption: "))
- (label (read-string "Label: " LaTeX-figure-label))
+ (let ((float (TeX-read-string "Float to: " LaTeX-float))
+ (caption (TeX-read-string "Caption: "))
+ (label (TeX-read-string "Label: " LaTeX-figure-label))
; gf: ask if this should be centered
(psfile (read-file-name "PS-file: " "" "" nil))
- (figwidth (read-string "Figure width: "))
- (figheight (read-string "Figure height: "))
+ (figwidth (TeX-read-string "Figure width: "))
+ (figheight (TeX-read-string "Figure height: "))
)
(setq LaTeX-float (if (zerop (length float))
diff --git a/style/pstricks.el b/style/pstricks.el
index 161370c..d5adbda 100644
--- a/style/pstricks.el
+++ b/style/pstricks.el
@@ -1,6 +1,6 @@
;;; pstricks.el --- AUCTeX style for the `pstricks' package.
-;; Copyright (C) 2007, 2009, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009, 2013, 2014 Free Software Foundation, Inc.
;; Author: Holger Sparr <address@hidden>
;; Maintainer: address@hidden
@@ -636,7 +636,7 @@ package PNAME"
(defun LaTeX-pst-macro-newpsobject (&optional arg)
"Return \\newpsobject arguments after querying."
- (insert "{" (read-string "New PSObject Name: ") "}"
+ (insert "{" (TeX-read-string "New PSObject Name: ") "}"
;; FIXME: It would be better to use something more confined
;; than `TeX-symbol-list'.
"{" (completing-read "Parent Object: " (TeX-symbol-list))
diff --git a/style/scrbase.el b/style/scrbase.el
index 2414763..169b6ec 100644
--- a/style/scrbase.el
+++ b/style/scrbase.el
@@ -1,6 +1,6 @@
;;; scrbase.el --- AUCTeX style for the KOMA-Script bundle.
-;; Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2005, 2007, 2014 Free Software Foundation, Inc.
;; Author: Mark Trettin <address@hidden>
;; Created: 2002-09-26
@@ -75,8 +75,8 @@
'("labeling" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((delim (read-string "(Optional) Delimiter: "))
- (width (read-string "Longest item: ")))
+ (let ((delim (TeX-read-string "(Optional) Delimiter: "))
+ (width (TeX-read-string "Longest item: ")))
(concat
(if (not (zerop (length delim)))
(format "[%s]" delim))
@@ -87,8 +87,8 @@
'("addmargin" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((leftin (read-string "(Optional) Left Indentation:
"))
- (indent (read-string "Indentation: ")))
+ (let ((leftin (TeX-read-string "(Optional) Left
Indentation: "))
+ (indent (TeX-read-string "Indentation: ")))
(concat
(if (not (zerop (length leftin)))
(format "[%s]" leftin))
@@ -96,8 +96,8 @@
'("addmargin*" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((innin (read-string "(Optional) Inner Indentation:
"))
- (indent (read-string "Indentation: ")))
+ (let ((innin (TeX-read-string "(Optional) Inner
Indentation: "))
+ (indent (TeX-read-string "Indentation: ")))
(concat
(if (not (zerop (length innin)))
(format "[%s]" innin))
@@ -105,11 +105,11 @@
'("captionbeside" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((lofent (read-string "(Optional) Lof Entry: "))
- (title (read-string "Caption: "))
- (place (read-string "(Optional) Placement
(l,r,o,i): "))
- (width (read-string "(Optional) Width: "))
- (offset (read-string "(Optional) Offset: ")))
+ (let ((lofent (TeX-read-string "(Optional) Lof Entry:
"))
+ (title (TeX-read-string "Caption: "))
+ (place (TeX-read-string "(Optional) Placement
(l,r,o,i): "))
+ (width (TeX-read-string "(Optional) Width: "))
+ (offset (TeX-read-string "(Optional) Offset:
")))
(concat
(if (not (zerop (length lofent)))
(format "[%s]" lofent))
diff --git a/style/scrlttr2.el b/style/scrlttr2.el
index 44d6270..e697316 100644
--- a/style/scrlttr2.el
+++ b/style/scrlttr2.el
@@ -1,6 +1,6 @@
;;; scrlttr2.el --- AUCTeX style for scrlttr2.cls.
-;; Copyright (C) 2002, 2007 Free Software Foundation
+;; Copyright (C) 2002, 2007, 2014 Free Software Foundation
;; Author: Mark Trettin <address@hidden>
;; Created: 2002-10-26
@@ -130,8 +130,8 @@
'("letter" (lambda (env &rest ignore)
(LaTeX-insert-environment
env
- (let ((options (read-string "Optional options: "))
- (recip (read-string "Recipient: ")))
+ (let ((options (TeX-read-string "Optional options: "))
+ (recip (TeX-read-string "Recipient: ")))
(concat
(if (not (zerop (length options)))
(format "[%s]" options))
diff --git a/tex-info.el b/tex-info.el
index 5027800..40b0391 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -1,6 +1,6 @@
;;; tex-info.el --- Support for editing Texinfo source.
-;; Copyright (C) 1993, 1994, 1997, 2000, 2001, 2004, 2005, 2006, 2011
+;; Copyright (C) 1993, 1994, 1997, 2000, 2001, 2004, 2005, 2006, 2011, 2014
;; Free Software Foundation, Inc.
;; Maintainer: address@hidden
@@ -312,7 +312,7 @@ for @node."
(point))))
nodes :test #'equal)))
(unless active-mark
- (setq node-name (read-string "Node name: ")))
+ (setq node-name (TeX-read-string "Node name: ")))
;; FIXME: What if key binding for `minibuffer-complete' was changed?
;; `substitute-command-keys' doesn't return the correct value.
(setq next-node (completing-read "Next node (TAB completes): " nodes))
diff --git a/tex.el b/tex.el
index 4e392f1..05f5d1d 100644
--- a/tex.el
+++ b/tex.el
@@ -3020,7 +3020,7 @@ INITIAL-INPUT is a string to insert before reading input."
(let ((TeX-argument (buffer-substring (point) (mark))))
(delete-region (point) (mark))
TeX-argument)
- (read-string (TeX-argument-prompt optional prompt "Text") initial-input))
+ (TeX-read-string (TeX-argument-prompt optional prompt "Text")
initial-input))
optional))
(defun TeX-parse-arguments (args)
-----------------------------------------------------------------------
Summary of changes:
context.el | 2 +-
latex.el | 50 ++++++++++++++++++++++++------------------------
style/CJK.el | 6 ++--
style/amsmath.el | 6 ++--
style/amsthm.el | 4 +-
style/beamer.el | 20 +++++++++---------
style/csquotes.el | 4 +-
style/dinbrief.el | 38 ++++++++++++++++++------------------
style/dk-bib.el | 4 +-
style/emp.el | 14 ++++++------
style/epsf.el | 6 +++-
style/filecontents.el | 4 +-
style/foils.el | 5 +++-
style/graphicx.el | 40 +++++++++++++++++++-------------------
style/inputenc.el | 4 +-
style/letter.el | 18 ++++++++--------
style/longtable.el | 4 +-
style/mathtools.el | 10 ++++----
style/natbib.el | 8 +++---
style/paralist.el | 2 +-
style/plext.el | 8 +++---
style/prosper.el | 4 +-
style/psfig.el | 17 +++++++++------
style/pstricks.el | 4 +-
style/scrbase.el | 24 +++++++++++-----------
style/scrlttr2.el | 6 ++--
tex-info.el | 4 +-
tex.el | 2 +-
28 files changed, 163 insertions(+), 155 deletions(-)
hooks/post-receive
--
GNU AUCTeX
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 0c2cfc8238841b64f701db44262389873552cfc6,
Davide G. M. Salvetti <=