[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex e3c60cf 08/36: Add new style/bica
From: |
Tassilo Horn |
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex e3c60cf 08/36: Add new style/bicaption.el |
Date: |
Thu, 22 Dec 2016 13:08:11 +0000 (UTC) |
branch: externals/auctex
commit e3c60cfa033546bf8c11dd9956a68de65ff7b38e
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
Add new style/bicaption.el
* Makefile.in (STYLESRC): Add new style.
* style/bicaption.el: New file.
---
Makefile.in | 3 +-
style/bicaption.el | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index ebc1906..a291ed2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,7 +157,8 @@ STYLESRC = style/prosper.el \
style/splitidx.el style/tikz.el style/xcolor.el \
style/pdflscape.el style/commath.el style/empheq.el \
style/framed.el style/paracol.el style/menukeys.el \
- style/bidi.el style/FiraMono.el style/FiraSans.el
+ style/bidi.el style/FiraMono.el style/FiraSans.el \
+ style/bicaption.el
STYLEELC = $(STYLESRC:.el=.elc)
diff --git a/style/bicaption.el b/style/bicaption.el
new file mode 100644
index 0000000..b361393
--- /dev/null
+++ b/style/bicaption.el
@@ -0,0 +1,181 @@
+;;; bicaption.el --- AUCTeX style for `bicaption.sty' (v1.1-158)
+
+;; Copyright (C) 2016 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <arash.esbati'at'gmail.com>
+;; Maintainer: address@hidden
+;; Created: 2016-11-11
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `bicaption.sty' (v1.1-158) from
+;; 2016/03/27. `bicaption.sty' is part of TeXLive.
+
+;; If things do not work or when in doubt, press `C-c C-n'. Comments
+;; for improvement are welcome.
+
+;;; Code:
+
+(defvar LaTeX-bicaption-key-val-options
+ '(("bi-lang" ("first" "second" "both"))
+ ("bi-singlelinecheck" ("false" "no" "off" "0" "true" "yes" "on" "1"))
+ ("bi-slc" ("false" "no" "off" "0" "true" "yes" "on" "1"))
+ ("bi-swap" ("false" "no" "off" "0" "true" "yes" "on" "1"))
+ ("listtype+"))
+ "Key=value options for bicaption macros.")
+
+(defun LaTeX-arg-bicaption-bicaption (optional &optional prompt star cap-box
label-inside)
+ "Query for the arguments of \"\bicaption\" incl. a label and insert them.
+PROMPT replaces the standard one. If STAR is non-nil, then do
+not query for a \label and short captions, insert only captions.
+If CAP-BOX is non-nil, also query and include optional arguments
+for the box command. If LABEL-INSIDE is non-nil, insert \label
+inside the first mandatory argument, otherwise after all
+arguments."
+ (let* (;; isubcaption needs an environment, "minipage" will be
+ ;; popular. If so, check next higher environment to find out
+ ;; where we are
+ (currenv (if (string= (LaTeX-current-environment) "minipage")
+ (LaTeX-current-environment 2)
+ (LaTeX-current-environment)))
+ (captionI (TeX-read-string
+ (TeX-argument-prompt
+ optional (when prompt
+ (concat "1. " prompt "bicaption"))
+ "1. bicaption")))
+ (short-captionI
+ (when (and (not star)
+ (>= (length captionI) LaTeX-short-caption-prompt-length))
+ (TeX-read-string
+ (TeX-argument-prompt t (when prompt
+ (concat "Short 1. " prompt "bicaption"))
+ "Short 1. bicaption"))))
+ (captionII (TeX-read-string
+ (TeX-argument-prompt
+ optional (when prompt
+ (concat "2. " prompt "bicaption"))
+ "2. bicaption")))
+ (short-captionII
+ (when (and (not star)
+ (>= (length captionII) LaTeX-short-caption-prompt-length))
+ (TeX-read-string
+ (TeX-argument-prompt t (when prompt
+ (concat "Short 2. " prompt "bicaption"))
+ "Short 2. bicaption")))))
+ (indent-according-to-mode)
+ ;; Insert short & regular 1. caption
+ (when (and short-captionI (not (string= short-captionI "")))
+ (insert LaTeX-optop short-captionI LaTeX-optcl))
+ (insert TeX-grop captionI)
+ ;; For i(sub)?captionbox, the label must be inserted here
+ (when (and label-inside (not star))
+ (LaTeX-label currenv 'environment))
+ (insert TeX-grcl)
+ (LaTeX-fill-paragraph)
+ (LaTeX-newline)
+ (indent-according-to-mode)
+ ;; Insert short & regular 2. caption
+ (when (and short-captionII (not (string= short-captionII "")))
+ (insert LaTeX-optop short-captionII LaTeX-optcl))
+ (insert TeX-grop captionII TeX-grcl)
+ ;; Insert width & pos in case of captionbox macros:
+ (when cap-box
+ (let* ((TeX-arg-opening-brace "[")
+ (TeX-arg-closing-brace "]")
+ (width (completing-read (TeX-argument-prompt t nil "Width")
+ (mapcar (lambda (elt) (concat TeX-esc (car
elt)))
+ (LaTeX-length-list))))
+ (inpos (if (and width (not (string-equal width "")))
+ (completing-read (TeX-argument-prompt t nil "Inner
position")
+ '("c" "l" "r" "s"))
+ "")))
+ (TeX-argument-insert width t)
+ (TeX-argument-insert inpos t)))
+ (LaTeX-fill-paragraph)
+ ;; Insert label
+ (when (and (not label-inside) (not star))
+ (LaTeX-newline)
+ (indent-according-to-mode)
+ (LaTeX-label currenv 'environment))))
+
+(defun LaTeX-arg-bicaption-captionsetup (optional)
+ "Query for 2 arguments for \"\captionsetup\" with bicaption.sty loaded.
+When OPTIONAL is non-nil, include both as optional arguments in
+square brackets."
+ (let* ((flttype (completing-read (TeX-argument-prompt optional nil "Float
type")
+ LaTeX-caption-supported-float-types))
+ (biflt (if (and (not (or (string= flttype "bi")
+ (string= flttype "bi-first")
+ (string= flttype "bi-second")))
+ flttype (not (string= flttype "")))
+ (completing-read (TeX-argument-prompt optional nil
"Bicaption type")
+ '("bi" "bi-first" "bi-second"))
+ "")))
+ (TeX-argument-insert flttype optional)
+ (TeX-argument-insert biflt optional)))
+
+(TeX-add-style-hook
+ "bicaption"
+ (lambda ()
+
+ ;; Load caption.el:
+ (TeX-run-style-hooks "caption")
+
+ ;; Macros
+ (TeX-add-symbols
+ '("bicaption" (LaTeX-arg-bicaption-bicaption))
+ '("bicaption*" (LaTeX-arg-bicaption-bicaption nil t))
+ '("bicaptionbox" (LaTeX-arg-bicaption-bicaption nil nil t t) t)
+ '("bicaptionbox*" (LaTeX-arg-bicaption-bicaption nil t t) t)
+ '("bisubcaption" (LaTeX-arg-bicaption-bicaption "sub-"))
+ '("bisubcaption*" (LaTeX-arg-bicaption-bicaption "sub-" t))
+ '("bisubcaptionbox" (LaTeX-arg-bicaption-bicaption "sub-" nil t t) t)
+ '("bisubcaptionbox*" (LaTeX-arg-bicaption-bicaption "sub-" t t t) t))
+
+ ;; Everything starting with i(sub)?caption should get its own line
+ (LaTeX-paragraph-commands-add-locally '("bicaption" "bisubcaption"))
+
+ ;; Fontification
+ (when (and (featurep 'font-latex)
+ (eq TeX-install-font-lock 'font-latex-setup))
+ (font-latex-add-keywords '(("bicaption" "*[{[{")
+ ("bicaptionbox" "*[{[{[[")
+ ("bisubcaption" "*[{[{")
+ ("bisubcaptionbox" "*[{[{[["))
+ 'textual)))
+ LaTeX-dialect)
+
+(defun LaTeX-bicaption-package-options ()
+ "Prompt for package options for the bicaption package."
+ (TeX-read-key-val t
+ (append
+ `(,(list "language"
+ (cond ((and (member "babel" (TeX-style-list))
+ (LaTeX-babel-active-languages))
+ (butlast (LaTeX-babel-active-languages)))
+ ((and (member "polyglossia"
(TeX-style-list))
+ (LaTeX-polyglossia-active-languages))
+ (butlast (LaTeX-babel-active-languages)))
+ (t nil))))
+ LaTeX-bicaption-key-val-options
+ LaTeX-caption-key-val-options)))
+
+;;; bicaption.el ends here
- [AUCTeX-diffs] [elpa] externals/auctex b44d524 35/36: Uniform font-lock updates/don't break prettify (bug#25245), (continued)
- [AUCTeX-diffs] [elpa] externals/auctex b44d524 35/36: Uniform font-lock updates/don't break prettify (bug#25245), Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 79c8264 19/36: Fix query for defined colors in style/textpos.el, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 8a14439 11/36: Add style file for subfiles package., Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 6ec185e 16/36: Do not spell-check arguments of \LTXtable, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 6a31d4e 14/36: Support new floats defined with newfloat package, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 42dd1f1 22/36: Support RefTeX with `reftex-add-index-macros' in style/splitidx.el, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex b59075b 06/36: Do not insert a new line if \label is omitted, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 945035c 24/36: Append tabular[xy] to `LaTeX-item-list', Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 0265793 25/36: Add "s" and "S" to `LaTeX-array-column-letters', Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex c5d1d02 13/36: Append entry to `LaTeX-label-alist' for new "verbatim" floats, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex e3c60cf 08/36: Add new style/bicaption.el,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex 76db91e 27/36: Accept non-letter characters as column specifier, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex c265fc9 02/36: Add new style/FiraMono.el, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 25e4f33 03/36: Add new style/FiraSans.el, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 0d26aba 01/36: Suggest to display warnings when there are no errors in error overview, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex a833aff 26/36: Use `LaTeX-item-longtable' while inserting longtable's, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 1c9de7e 29/36: Count *-operator in column specification, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex c4cb166 33/36: Add style/ directory to TeX-style-path for tests, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 2f75f51 17/36: Add support for LaTeX core command extsubscript, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex cb6bc11 07/36: Add support for style/bicaption.el to style/caption.el, Tassilo Horn, 2016/12/22
- [AUCTeX-diffs] [elpa] externals/auctex 70c6499 34/36: Fix to TeX-add-local-master, Tassilo Horn, 2016/12/22