New Upstream Release - yatex
Ready changes
Summary
Merged new upstream version: 1.83 (was: 1.82).
Resulting package
Built on 2023-01-03T20:57 (took 10m29s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases yatex
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 84620a6..1112245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yatex (1.83-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 03 Jan 2023 20:48:54 -0000
+
yatex (1.82-1) unstable; urgency=medium
[ KURASHIKI Satoru ]
diff --git a/debian/patches/debianize-fhs b/debian/patches/debianize-fhs
index c9df99c..f3c8509 100644
--- a/debian/patches/debianize-fhs
+++ b/debian/patches/debianize-fhs
@@ -2,10 +2,10 @@ Description: fix info path to be compliant with FHS.
Origin: vendor
Author: Junichi Uekawa <dancer@debian.org>
-Index: yatex/yatexhlp.el
+Index: yatex.git/yatexhlp.el
===================================================================
---- yatex.orig/yatexhlp.el 2012-02-11 23:26:52.680555558 +0900
-+++ yatex/yatexhlp.el 2012-02-11 23:27:05.620619724 +0900
+--- yatex.git.orig/yatexhlp.el
++++ yatex.git/yatexhlp.el
@@ -14,7 +14,7 @@
((string-match "\\.app/" doc-directory) ;For Emacs.app(Darwin)
(expand-file-name "../site-lisp/yatex" doc-directory))
diff --git a/debian/patches/fix-docstring b/debian/patches/fix-docstring
index 68ffe9a..1167c70 100644
--- a/debian/patches/fix-docstring
+++ b/debian/patches/fix-docstring
@@ -1,8 +1,8 @@
-Index: yatex/yatexlib.el
+Index: yatex.git/yatexlib.el
===================================================================
---- yatex.orig/yatexlib.el
-+++ yatex/yatexlib.el
-@@ -1068,8 +1068,8 @@ This function returns correct result onl
+--- yatex.git.orig/yatexlib.el
++++ yatex.git/yatexlib.el
+@@ -1105,8 +1105,8 @@ This function returns correct result onl
(defun YaTeX-goto-corresponding-environment (&optional allow-mismatch noerr bg)
"Go to corresponding begin/end enclosure.
Optional argument ALLOW-MISMATCH allows mismatch open/clese. Use this
@@ -13,11 +13,11 @@ Index: yatex/yatexlib.el
(interactive)
(if (not (YaTeX-on-begin-end-p)) nil
(let ((p (match-end 0)) b0 b1 env (nest 0) regexp re-s (op (point))
-Index: yatex/yatexenv.el
+Index: yatex.git/yatexenv.el
===================================================================
---- yatex.orig/yatexenv.el
-+++ yatex/yatexenv.el
-@@ -360,7 +360,7 @@ Count the number of & in the first align
+--- yatex.git.orig/yatexenv.el
++++ yatex.git/yatexenv.el
+@@ -361,7 +361,7 @@ Count the number of & in the first align
;;;###autoload
(defun YaTeX-goto-corresponding-leftright ()
@@ -26,11 +26,11 @@ Index: yatex/yatexenv.el
(let ((YaTeX-struct-begin "\\left%1")
(YaTeX-struct-end "\\right%1")
(YaTeX-struct-name-regexp "[][(){}\\.|]")
-Index: yatex/yatex.el
+Index: yatex.git/yatex.el
===================================================================
---- yatex.orig/yatex.el
-+++ yatex/yatex.el
-@@ -857,7 +857,7 @@ more features are available and they are
+--- yatex.git.orig/yatex.el
++++ yatex.git/yatex.el
+@@ -867,7 +867,7 @@ more features are available and they are
(autoload 'YaTeX-what-column "yatexenv" "YaTeX env. specific funcs" t)
(autoload 'YaTeX-intelligent-newline "yatexenv" "YaTeX env. specific funcs" t)
(autoload 'YaTeX-indent-line-equation "yatexenv" "Indent equation lines." t)
diff --git a/debian/patches/info-dir b/debian/patches/info-dir
index 0ef022e..78a7f39 100644
--- a/debian/patches/info-dir
+++ b/debian/patches/info-dir
@@ -2,10 +2,10 @@ Description: add info direntry.
Origin: vendor
Author: KURASHIKI Satoru <lurdan@gmail.com>
-Index: yatex/docs/yatexe.tex
+Index: yatex.git/docs/yatexe.tex
===================================================================
---- yatex.orig/docs/yatexe.tex 2012-05-27 06:27:14.000000000 +0000
-+++ yatex/docs/yatexe.tex 2012-06-13 00:06:46.000000000 +0000
+--- yatex.git.orig/docs/yatexe.tex
++++ yatex.git/docs/yatexe.tex
@@ -1,7 +1,8 @@
\def\lang{jp} % -*- texinfo -*-
\input texinfo.tex
@@ -16,10 +16,10 @@ Index: yatex/docs/yatexe.tex
@direntry
* YaTeX-e: (yatexe). Yet Another tex-mode for Emacs (English).
@end direntry
-Index: yatex/docs/yatexj.tex
+Index: yatex.git/docs/yatexj.tex
===================================================================
---- yatex.orig/docs/yatexj.tex 2012-05-27 06:27:14.000000000 +0000
-+++ yatex/docs/yatexj.tex 2012-06-13 00:06:57.000000000 +0000
+--- yatex.git.orig/docs/yatexj.tex
++++ yatex.git/docs/yatexj.tex
@@ -1,7 +1,8 @@
\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
\input texinfo
@@ -30,10 +30,10 @@ Index: yatex/docs/yatexj.tex
@direntry
* YaTeX: (yatexj). Yet Another tex-mode for Emacs (Japanese).
@end direntry
-Index: yatex/docs/yahtmle.tex
+Index: yatex.git/docs/yahtmle.tex
===================================================================
---- yatex.orig/docs/yahtmle.tex 2012-05-27 06:27:14.000000000 +0000
-+++ yatex/docs/yahtmle.tex 2012-06-13 00:43:41.000000000 +0000
+--- yatex.git.orig/docs/yahtmle.tex
++++ yatex.git/docs/yahtmle.tex
@@ -1,7 +1,8 @@
\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
\input texinfo
@@ -44,10 +44,10 @@ Index: yatex/docs/yahtmle.tex
@direntry
* yahtml-e: (yahtmle). Yet Another html-mode for Emacs (English).
@end direntry
-Index: yatex/docs/yahtmlj.tex
+Index: yatex.git/docs/yahtmlj.tex
===================================================================
---- yatex.orig/docs/yahtmlj.tex 2012-05-27 06:27:14.000000000 +0000
-+++ yatex/docs/yahtmlj.tex 2012-06-13 00:43:50.000000000 +0000
+--- yatex.git.orig/docs/yahtmlj.tex
++++ yatex.git/docs/yahtmlj.tex
@@ -1,7 +1,8 @@
\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
\input texinfo
diff --git a/debian/patches/quote-filename b/debian/patches/quote-filename
index 6c66048..0cd88d9 100644
--- a/debian/patches/quote-filename
+++ b/debian/patches/quote-filename
@@ -3,11 +3,11 @@ Author: KURASHIKI Satoru <lurdan@gmail.com>
Bug-Debian: http://bugs.debian.org/683470
Reviewed-By: Kevin Ryde <user42@zip.com.au>
-Index: yatex/yahtml.el
+Index: yatex.git/yahtml.el
===================================================================
---- yatex.orig/yahtml.el
-+++ yatex/yahtml.el
-@@ -2827,7 +2827,7 @@ See also yahtml-indent-line-1 and yahtml
+--- yatex.git.orig/yahtml.el
++++ yatex.git/yahtml.el
+@@ -2844,7 +2844,7 @@ See also yahtml-indent-line-1 and yahtml
(and bcmd (setq bcmd (yahtml-untranslate-string bcmd)))
(YaTeX-typeset
(concat (or bcmd yahtml-lint-program)
diff --git a/docs/qanda b/docs/qanda
index f623fd6..f7b2ca5 100644
--- a/docs/qanda
+++ b/docs/qanda
@@ -427,8 +427,9 @@
���炭�g���Ƃ�����̕����֗����Ɗ�����Ǝv���܂��B��������ł�
���ɍ���Ȃ����́AC-c w m �ŏ�ɏC�����[�h��ON�ɂ��Ďg���ĉ������B
- �ϐ� YaTeX-close-paren-always �̒l�� nil �ɃZ�b�g����ƋN������
- �犇�ʂ̎����N���[�Y��OFF�ɂ��܂��B
+ �ϐ� YaTeX-close-paren-always �̒l�� 'never �ɃZ�b�g����ƋN����
+ ���犇�ʂ̎����N���[�Y��OFF�ɂ��܂��Bnil �ɃZ�b�g����ƃ|�C���g
+ ���s���ɂȂ��Ƃ��̎����N���[�YOFF�ɂ��܂��B
�E; �������ƕςȂ̂��łė����肷��B
diff --git a/docs/qanda.eng b/docs/qanda.eng
index 685c756..a760b9d 100644
--- a/docs/qanda.eng
+++ b/docs/qanda.eng
@@ -292,10 +292,10 @@
*An open parenthesis always get entered in pairs.
- This should be better, once you get used to it. If you still
- don't like it, turn on modify-mode using C-c w m. Setting
- YaTeX-close-paren-always to nil will give this feature from the
- start.
+ This should be better, once you get used to it. If you still
+ don't like it, turn on modify-mode using C-c w m. Setting
+ YaTeX-close-paren-always to 'never will give this feature from
+ the start, nil will stop closing when not at end of line.
*Funny things happen when I hit ;.
diff --git a/help/YATEXHLP.eng b/help/YATEXHLP.eng
index 40bfa2e..dfc1f47 100644
--- a/help/YATEXHLP.eng
+++ b/help/YATEXHLP.eng
@@ -1765,6 +1765,12 @@ WIDTH Width of figure
\caption{foo image}\label{foo-jpg}
\end{wrapfigure}
+ wraptable
+\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...TABULAR... \end{wraptable}
+Create floating tabular.
+Usage is the same as wrapfigure environment except enclosing tabular.
+
+<refer wrapfigure>
abstract
\begin{abstract} ... \end{abstract}
diff --git a/help/YATEXHLP.jp b/help/YATEXHLP.jp
index e1c267e..554dd9a 100644
--- a/help/YATEXHLP.jp
+++ b/help/YATEXHLP.jp
@@ -1771,6 +1771,7 @@ POS r l i o
OVH(�ȗ���) �摜�̒���o���}�[�W��(\wrapoverhang �ʏ�0)
WIDTH ��荞�݂���(�摜���݂�)��
+
�y�g�p��z
% �v���A���u��
\usepackage{wrapfig}
@@ -1780,6 +1781,13 @@ WIDTH
\caption{�ق��ق�}\label{hoge-jpg}
\end{wrapfigure}
+ wraptable
+\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...�\... \end{wraptable}
+���E��荞�݂̕\���o�͂���(table���Ɠ��l�̃t���[�g�쐬)�B
+������tabular�n������_�ȊO�ɂ��Ă�wrapfigure�Ɠ��l�B
+
+<refer wrapfigure>
+
abstract
\begin{abstract} ... \end{abstract}
���^(�A�u�X�g���N�g)���o�͂���B
diff --git a/yahtml.el b/yahtml.el
index 3a0b993..b02ec79 100644
--- a/yahtml.el
+++ b/yahtml.el
@@ -1,8 +1,8 @@
;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*-
-;;; (c) 1994-2019 by HIROSE Yuuji [yuuji(@)yatex.org]
-;;; $Id: yahtml.el,v 9e07513fc2ef 2019-09-11 09:27 +0900 yuuji $
+;;; (c) 1994-2022 by HIROSE Yuuji [yuuji(@)yatex.org]
+;;; $Id: yahtml.el,v c1b39bbfcf34 2022-12-25 14:13 +0900 yuuji $
-(defconst yahtml-revision-number "1.80.1"
+(defconst yahtml-revision-number "1.83"
"Revision number of running yahtml.el")
;;; Commentary:
@@ -446,6 +446,7 @@ normal and region mode. To customize yahtml, user should use this function."
("option") ("datalist")
;;HTML5
("video") ("audio") ("figure") ("iframe")
+ ("header") ("footer") ("article") ("section") ("nav") ("main") ("aside")
))
(if yahtml-html4-strict
@@ -1184,7 +1185,7 @@ Not used yet.")
(defvar yahtml-link-types-alist
'(("alternate") ("stylesheet") ("start") ("next") ("prev")
("contents") ("index") ("glossary") ("chapter") ("section")
- ("subsection") ("appendix") ("help") ("bookmark")))
+ ("subsection") ("appendix") ("help") ("bookmark") ("manifest")))
(defvar yahtml-content-types-alist
'(("text/css") ("text/html") ("text/plain") ("text/richtext")
@@ -1480,7 +1481,9 @@ Returns list of '(WIDTH HEIGHT BYTES DEPTH COMMENTLIST)."
(defvar yahtml-input-types
'(("text") ("password") ("checkbox") ("radio") ("submit")
- ("reset") ("image") ("hidden") ("file")))
+ ("reset") ("image") ("hidden") ("file")
+ ("date") ("time") ("datetime-local") ("week") ("number") ("tel")
+ ("range") ("color")))
(defun yahtml:input ()
"Add-in function for `input' form"
@@ -1501,6 +1504,13 @@ Returns list of '(WIDTH HEIGHT BYTES DEPTH COMMENTLIST)."
(yahtml-make-optional-argument "value" value)
(yahtml-make-optional-argument "id" id)
(yahtml-make-optional-argument "size" size)
+ (if (string-match "range" type)
+ (concat (yahtml-make-optional-argument
+ "min" (YaTeX-read-string-or-skip "min: "))
+ (yahtml-make-optional-argument
+ "max" (YaTeX-read-string-or-skip "max: "))
+ (yahtml-make-optional-argument
+ "step" (YaTeX-read-string-or-skip "step: "))))
(yahtml-make-optional-argument "maxlength" maxlength))))
(defun yahtml:datalist ()
@@ -1619,7 +1629,7 @@ Returns list of '(WIDTH HEIGHT BYTES DEPTH COMMENTLIST)."
(concat
(yahtml-make-optional-argument "rel" rel)
(yahtml-make-optional-argument
- "type" (yahtml-read-parameter "type" "text/css"))
+ "type" (yahtml-read-parameter "type"))
(yahtml-make-optional-argument
"href"
(read-from-minibuffer-with-history
@@ -1714,6 +1724,9 @@ Returns list of '(WIDTH HEIGHT BYTES DEPTH COMMENTLIST)."
(yahtml-make-optional-argument
"value" (yahtml-read-parameter "value"))))
+(defun yahtml::article ()
+ (setq yahtml-last-typeface-cmd "h1" yahtml-last-begend "h1"))
+
;;; ---------- Simple tag ----------
(defun yahtml-insert-tag (region-mode &optional tag)
"Insert <TAG> </TAG> and put cursor inside of them."
diff --git a/yatex.el b/yatex.el
index ca24dbd..7dd1732 100644
--- a/yatex.el
+++ b/yatex.el
@@ -1,7 +1,7 @@
;;; yatex.el --- Yet Another tex-mode for emacs //�쒹// -*- coding: sjis -*-
-;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Thu Dec 26 12:46:41 2019 on firestorm
-;;; $Id: yatex.el,v 4dad5f91b26c 2019-12-26 12:50 +0859 yuuji $
+;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org]
+;;; Last modified Sun Dec 25 13:57:49 2022 on firestorm
+;;; $Id: yatex.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; 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.82"
+(defconst YaTeX-revision-number "1.83"
"Revision number of running yatex.el")
;---------- Local variables ----------
@@ -49,7 +49,7 @@ YaTeX-current-position-register.")
(defvar tex-command
(cond
- (YaTeX-use-LaTeX2e "platex -kanji=%k")
+ (YaTeX-use-LaTeX2e "platex -kanji=%k -synctex=1")
(YaTeX-japan "jlatex")
(t "latex"))
"*Default command for typesetting LaTeX text.
@@ -182,7 +182,7 @@ t
YaTeX-sectioning-regexp ;sectioning commands
"\\|[A-z]*item\\|begin{\\|end{" ;special declaration
"\\|\\[\\|\\]"
- "\\|newpage\\b\\|vspace\\b"
+ "\\|newpage\\b\\|vspace\\b\\|par\\b"
"\\)")
"*Paragraph starting regexp of common LaTeX source. Use this value
for YaTeX-uncomment-paragraph.")
@@ -192,7 +192,7 @@ for YaTeX-uncomment-paragraph.")
YaTeX-sectioning-regexp ;sectioning commands
"\\|begin{\\|end{" ;special declaration
"\\|\\[\\|\\]"
- "\\|newpage\\b\\|vspace\\b"
+ "\\|newpage\\b\\|vspace\\b\\|par\\b"
"\\)")
"*Paragraph delimiter regexp of common LaTeX source. Use this value
for YaTeX-uncomment-paragraph.")
@@ -315,6 +315,7 @@ Nil for removing only one commenting character at the beginning-of-line.")
("cline") ("framebox") ("savebox" 2) ("sbox" 2) ("newsavebox") ("usebox")
("date") ("put") ("ref") ("pageref") ("tabref") ("figref") ("raisebox" 2)
("multicolumn" 3) ("shortstack") ("parbox" 2)
+ ("textcircled") ("fbox")
;; for mathmode accent
("tilde") ("hat") ("check") ("bar") ("dot") ("ddot") ("vec")
("widetilde") ("widehat") ("overline") ("overrightarrow")
@@ -327,6 +328,8 @@ Nil for removing only one commenting character at the beginning-of-line.")
("subfigure") ;; subfigure
("ruby" 2) ("kenten") ;; okumacro
("geometry") ("path")
+ ("setstretch")
+ ("columncolor") ("rowcolor") ("cellcolor") ;; colortbl
)
(if YaTeX-use-LaTeX2e
'(("documentclass") ("usepackage")
@@ -359,7 +362,8 @@ Nil for removing only one commenting character at the beginning-of-line.")
(defvar YaTeX-ams-math-begin-alist
'(("align") ("align*") ("multline") ("multline*") ("gather") ("gather*")
("alignat") ("alignat*") ("xalignat") ("xalignat*")
- ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*")))
+ ("xxalignat") ("xxalignat*") ("flalign") ("flalign*") ("equation*")
+ ("fleqn")))
(defvar YaTeX-ams-math-gathering-alist
'(("matrix") ("pmatrix") ("bmatrix") ("Bmatrix") ("vmatrix") ("Vmatrix")
("split") ("split*") ("aligned") ("aligned*") ("alignedat") ("gathered")
@@ -402,7 +406,7 @@ Nil for removing only one commenting character at the beginning-of-line.")
("minipage") ("landscape")
("supertabular") ("floatingfigure") ("wrapfigure") ("wraptable")
("frame") ("block") ("example") ("columns") ("column") ;beamer
- ("tabularx")
+ ("tabularx") ("spacing")
)
(if YaTeX-use-LaTeX2e
'(("comment") ;defined in version
@@ -424,7 +428,7 @@ Nil for removing only one commenting character at the beginning-of-line.")
; Set {\Large }-like completion
(defvar fontsize-table
'(("rm") ("em") ("bf") ("boldmath") ("it") ("sl") ("sf") ("sc") ("tt")
- ("dg") ("dm")
+ ("dg") ("dm") ("mc") ("mcfamily") ("gt") ("gtfamily")
("tiny") ("scriptsize") ("footnotesize") ("small")("normalsize")
("large") ("Large") ("LARGE") ("huge") ("Huge")
("rmfamily") ("sffamily") ("ttfamily")
@@ -437,6 +441,8 @@ Nil for removing only one commenting character at the beginning-of-line.")
'(("rm" . "rmfamily")
("sf" . "sffamily")
("tt" . "ttfamily")
+ ("mc" . "mcfamily")
+ ("gt" . "gtfamily")
("md" . "mdseries")
("bf" . "bfseries")
("up" . "upshape")
@@ -451,6 +457,7 @@ Nil for removing only one commenting character at the beginning-of-line.")
(append
'(("maketitle") ("makeindex") ("sloppy") ("protect") ("par") ("and")
("LaTeX") ("TeX") ("item") ("item[]") ("appendix") ("hline") ("kill")
+ ("textbar") ("textbackslash")
;;("rightarrow") ("Rightarrow") ("leftarrow") ("Leftarrow")
("onecolumn") ("twocolumn")
("pagebreak") ("nopagebreak") ("tableofcontents")
@@ -878,7 +885,7 @@ more features are available and they are documented in the manual.
;; YaTeX-mode functions
;;;
(defun YaTeX-insert-begin-end (env region-mode)
- "Insert \\begin{mode-name} and \\end{mode-name}.
+ "Insert \\begin{env-name} and \\end{env-name}.
This works also for other defined begin/end tokens to define the structure."
(setq YaTeX-current-completion-type 'begin)
(let*((ccol (current-column)) beg beg2 exchange
diff --git a/yatex.new b/yatex.new
index d8cdf90..1aba21b 100644
--- a/yatex.new
+++ b/yatex.new
@@ -1,6 +1,18 @@
What's new in YaTeX/yahtml
�쒹/yahtml - �e�o�[�W�����̕ύX�_�ɂ���
+1.83 == yatex ==
+ Evince-dbus�A�g������(Thanks to TeX Wiki)�B
+ latex-message-kanji-code 0 �Ńv���Z�X�R�[�h 'undicided �ɂ��Ă݂��B
+ LuaTeX���Œ���PDF���o���ꂽ�Ƃ��ɂ�dvipdfmx�ȗ��B
+ uplatex�֘A�̂��̂Ȃǂ��������lj��B
+ ;di �� \displaystyle �⊮�B
+ Dbus�ł�evince-reverse-search���������B
+ �A�h�C���lj�: wraptable, spacing, tablecolor
+ �⊮�lj�: fleqn
+ == yahtml ==
+ �f�t�H���g�e�[�u��HTML5
+
1.82 == yatex ==
YaTeX::usepackage-alist-default ��p�~���A
YaTeX-package-alist-default �𗘗p����悤�ɂ����B
diff --git a/yatexadd.el b/yatexadd.el
index 7ebd9df..b042370 100644
--- a/yatexadd.el
+++ b/yatexadd.el
@@ -1,7 +1,7 @@
;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*-
-;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Thu Oct 17 09:44:48 2019 on firestorm
-;;; $Id: yatexadd.el,v 777d17c07759 2019-10-17 09:52 +0900 yuuji $
+;;; (c)1991-2022 by HIROSE Yuuji.[yuuji@yatex.org]
+;;; Last modified Fri Dec 2 08:40:27 2022 on firestorm
+;;; $Id: yatexadd.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; Code:
;;;
@@ -193,15 +193,22 @@ YaTeX-make-begin-end."
;; wrapfig.sty
-(defun YaTeX:wrapfigure ()
- (YaTeX-help "wrapfigure")
- (concat
- (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
- (if (string< "" lines)
- (concat "[" lines "]")))
- "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
- "{" (YaTeX:read-length "Image width: ") "}"))
-
+(defun YaTeX:wrapfigure (&optional kind)
+ (setq kind (or kind "figure"))
+ (YaTeX-help (concat "wrap" kind))
+ (prog1
+ (concat
+ (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
+ (if (string< "" lines)
+ (concat "[" lines "]")))
+ "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
+ "{" (YaTeX:read-length (concat (capitalize kind) " width: ")) "}")
+ (setq YaTeX-section-name "includegraphics")))
+
+(defun YaTeX:wraptable ()
+ (prog1
+ (YaTeX:wrapfigure "table")
+ (setq YaTeX-env-name "tabular")))
;;;
;;Sample functions for section-type command.
@@ -306,6 +313,11 @@ YaTeX-make-begin-end."
(defun YaTeX:itembox ()
(concat "{" (YaTeX-read-string-or-skip "Item heading string: ") "}"))
+(defun YaTeX:spacing ()
+ (concat "{" (read-string-with-history "Line spacing by: ") "}"))
+(defun YaTeX::setstretch (argp)
+ (read-string-with-history "Page global Line stretch factor: "))
+
;;;
;;Sample functions for maketitle-type command.
;;;
@@ -1843,6 +1855,7 @@ and print them to standard output."
("oneside") ("twoside") ("draft") ("final") ("leqno") ("fleqn") ("openbib")
("tombow") ("titlepage") ("notitlepage") ("dvips")
("mingoth") ;for jsarticle
+ ("uplatex") ;for uplatex
("clock") ;for slides class only
)
"Default options list for documentclass")
@@ -1880,7 +1893,9 @@ and print them to standard output."
(defvar YaTeX:documentclasses-default
'(("article") ("jarticle") ("report") ("jreport") ("book") ("jbook")
- ("jsarticle") ("jsbook")
+ ("ltjsarticle") ("ltjsreport") ("ltjsbook")
+ ("ltjarticle") ("ltjreport") ("ltjbook")
+ ("jsarticle") ("jsreport") ("jsbook")
("j-article") ("j-report") ("j-book")
("letter") ("slides") ("ltxdoc") ("ltxguide") ("ltnews") ("proc"))
"Default documentclass alist")
@@ -1981,6 +1996,48 @@ and print them to standard output."
((= argp 2) (YaTeX::color-completing-read "Inner color: "))
((= argp 3) (YaTeX-read-string-or-skip "Colored string: "))))
+(defun YaTeX:columncolor ()
+ (let ((model (YaTeX-completing-read-or-skip
+ "Color model: " '(("rgb") ("gray") ("named")))))
+ (put 'YaTeX:columncolor 'model model)
+ (if (string= "" model) "" (concat "[" model "]"))))
+
+(fset 'YaTeX:rowcolor 'YaTeX:columncolor)
+(fset 'YaTeX:cellcolor 'YaTeX:columncolor)
+
+(defun YaTeX::columncolor (argp)
+ (let ((model (get 'YaTeX:columncolor 'model))
+ (type (cond ((string-match "column" YaTeX-section-name) "Column")
+ ((string-match "row" YaTeX-section-name) "Row")
+ ((string-match "cell" YaTeX-section-name) "Cell")
+ (t "Table")))
+ (last (get 'YaTeX::columncolor 'last-color))
+ str)
+ (put 'YaTeX::columncolor 'last-color
+ (cond
+ ((equal model "rgb")
+ (setq str (YaTeX-read-string-or-skip
+ "R, G, B values: "
+ (cons (or last "0.6, 0.8, 0.9") 0)))
+ (cond
+ ((string-match ",.*," str) str)
+ ((string-match "\\(\\S +\\)\\s +\\(\\S +\\)\\s +\\(\\S +\\)" str)
+ (format "%s, %s, %s" (YaTeX-match-string 1 1 str)
+ (YaTeX-match-string 2 2 str)(YaTeX-match-string 3 3 str)))
+ (t (message "%s may cause error on typesetting" str)
+ str)))
+ ((equal model "gray")
+ (setq str (YaTeX-read-string-or-skip "Grayscale values(0.0 - 1.0): "))
+ (if (<= (string-to-number str) 1)
+ str
+ (message "%s may be an error. Values from 0.0 to 1.0 are acceptable")
+ str))
+ ((equal model "named")
+ (YaTeX::color-completing-read (concat type " color")))
+ ))))
+(fset 'YaTeX::rowcolor 'YaTeX::columncolor)
+(fset 'YaTeX::cellcolor 'YaTeX::columncolor)
+
(defun YaTeX:scalebox ()
"Add-in for \\scalebox"
(let ((vmag (YaTeX-read-string-or-skip (if YaTeX-japan "�{��(���Ŕ��]): "
@@ -2044,7 +2101,8 @@ and print them to standard output."
(if (string= "" str) ""
(concat "[" str "]"))))
-(defvar YaTeX::get-boundingbox-cmd YaTeX-cmd-gs
+(defvar YaTeX::get-boundingbox-cmd
+ (or (YaTeX-executable-find "extractbb") YaTeX-cmd-gs)
"Command to get bounding box from PDF files.
Possible values are `gs' and `extractbb'.")
@@ -2078,7 +2136,7 @@ This function relies on gs(ghostscript) command installed."
(or (fboundp 'yahtml-get-image-info)
(progn
(load "yahtml" t) (featurep 'yahtml))) ;(require 'yahtml nil t)
- (if (string-match "\\.pdf" imgfile)
+ (if (string-match "\\.\\(pdf\\|png\\)" imgfile)
(and
(setq info (YaTeX::get-boundingbox imgfilepath))
(stringp info)
@@ -2196,6 +2254,21 @@ This function relies on gs(ghostscript) command installed."
((memq c '(?c ?C)) (setq left "{\\scriptsize " right "}")))
(format "%s%s%s" left char right)))))
+
+;;; -------------------- booktab staff --------------------
+(defun YaTeX::toprule (argp)
+ (if (equal argp 1) (YaTeX:read-length "Top Rule Width: ")))
+(defun YaTeX::midrule (argp)
+ (if (equal argp 1) (YaTeX:read-length "Middle Rule Width: ")))
+(defun YaTeX::cmidrule (argp)
+ (if (equal argp 1) (YaTeX:read-length "Inter-Columns Rule Width: ")))
+(defun YaTeX::bottomrule (argp)
+ (if (equal argp 1) (YaTeX:read-length "Bottom Rule Width: ")))
+(defun YaTeX::addlinespace (argp)
+ (if (equal argp 1) (YaTeX:read-length "Additional Line space: ")))
+(defun YaTeX::specialrule (argp)
+ (if (equal argp 1) (YaTeX:read-length "Special rule: ")))
+
;;; -------------------- beamer stuff --------------------
(defvar YaTeX:frame-option-alist-default
'(("plain") ("containsverbatim") ("shrink") ("squeeze")
diff --git a/yatexenv.el b/yatexenv.el
index 608e2e0..3c80dec 100644
--- a/yatexenv.el
+++ b/yatexenv.el
@@ -1,7 +1,7 @@
;;; yatexenv.el --- YaTeX environment-specific functions
;;; (c) 1994-2019 by HIROSE Yuuji.[yuuji@yatex.org]
;;; Last modified Sat May 25 14:46:33 2019 on firestorm
-;;; $Id: yatexenv.el,v 714f3527b4a1 2019-05-25 14:48 +0900 yuuji $
+;;; $Id: yatexenv.el,v b9ba8aacbea6 2019-12-26 12:53 +0859 yuuji $
;;; Code:
;;;
diff --git a/yatexlib.el b/yatexlib.el
index 5f4127e..9085922 100644
--- a/yatexlib.el
+++ b/yatexlib.el
@@ -1,8 +1,8 @@
;;; yatexlib.el --- YaTeX and yahtml common libraries -*- coding: sjis -*-
;;;
-;;; (c)1994-2019 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Thu Dec 26 12:47:45 2019 on firestorm
-;;; $Id: yatexlib.el,v 4dad5f91b26c 2019-12-26 12:50 +0859 yuuji $
+;;; (c)1994-2022 by HIROSE Yuuji.[yuuji@yatex.org]
+;;; Last modified Fri Dec 2 08:41:16 2022 on firestorm
+;;; $Id: yatexlib.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; Code:
@@ -119,6 +119,38 @@ This variable is effective when font-lock is used.
"*Main LaTeX source file name used when %#! expression doesn't exist.")
(make-variable-buffer-local 'YaTeX-parent-file)
+;;;
+;; Emacs 21 compensational wrapper
+;;;
+(defun YaTeX-minibuffer-begin ()
+ (if (fboundp 'field-beginning)
+ (field-beginning (point-max))
+ (point-min)))
+
+(defun YaTeX-minibuffer-end ()
+ (if (fboundp 'field-end)
+ (field-end (point-max))
+ (point-max)))
+
+(defun YaTeX-minibuffer-string ()
+ (buffer-substring (YaTeX-minibuffer-begin) (YaTeX-minibuffer-end)))
+
+(defun YaTeX-minibuffer-erase ()
+ (if (eq (selected-window) (minibuffer-window))
+ (if (fboundp 'delete-field) (delete-field) (erase-buffer))))
+
+(fset 'YaTeX-buffer-substring
+ (if (fboundp 'buffer-substring-no-properties)
+ 'buffer-substring-no-properties
+ 'buffer-substring))
+(fset 'YaTeX-substring
+ (if (fboundp 'substring-no-properties)
+ 'substring-no-properties
+ 'substing))
+
+(defun YaTeX-region-active-p ()
+ (and (fboundp 'region-active-p) (region-active-p)))
+
;---------- Define default key bindings on YaTeX mode map ----------
;;;###autoload
(defun YaTeX-kanji-ptex-mnemonic ()
@@ -627,11 +659,14 @@ where ever it appears."
(where-is-internal olddef keymap))))
;;;###autoload
-(defun YaTeX-match-string (n &optional m)
- "Return (buffer-substring (match-beginning n) (match-beginning m))."
+(defun YaTeX-match-string (n &optional m str)
+ "Return (buffer-substring (match-beginning n) (match-beginning m)).
+Optional third argument STR gives substring from string STR."
(if (match-beginning n)
- (YaTeX-buffer-substring (match-beginning n)
- (match-end (or m n)))))
+ (if str (YaTeX-substring
+ str (match-beginning m) (match-end (or m n)))
+ (YaTeX-buffer-substring (match-beginning n)
+ (match-end (or m n))))))
;;;###autoload
(defun YaTeX-minibuffer-complete ()
@@ -1384,34 +1419,6 @@ See yatex19.el for example."
(define-key (symbol-value keymap) (vector (car bind)) (cdr bind))))
bindlist))))
-;;;
-;; Emacs 21 compensational wrapper
-;;;
-(defun YaTeX-minibuffer-begin ()
- (if (fboundp 'field-beginning)
- (field-beginning (point-max))
- (point-min)))
-
-(defun YaTeX-minibuffer-end ()
- (if (fboundp 'field-end)
- (field-end (point-max))
- (point-max)))
-
-(defun YaTeX-minibuffer-string ()
- (buffer-substring (YaTeX-minibuffer-begin) (YaTeX-minibuffer-end)))
-
-(defun YaTeX-minibuffer-erase ()
- (if (eq (selected-window) (minibuffer-window))
- (if (fboundp 'delete-field) (delete-field) (erase-buffer))))
-
-(fset 'YaTeX-buffer-substring
- (if (fboundp 'buffer-substring-no-properties)
- 'buffer-substring-no-properties
- 'buffer-substring))
-
-(defun YaTeX-region-active-p ()
- (and (fboundp 'region-active-p) (region-active-p)))
-
;;;
;; hilit19 vs. font-lock
;;;
diff --git a/yatexmth.el b/yatexmth.el
index 3e18e68..071a780 100644
--- a/yatexmth.el
+++ b/yatexmth.el
@@ -1,8 +1,8 @@
;;; yatexmth.el --- YaTeX math-mode-specific functions -*- coding: sjis -*-
;;;
-;;; (c)1993-2018 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Tue Dec 25 20:02:12 2018 on firestorm
-;;; $Id: yatexmth.el,v 3f5ce5a755c4 2018-12-25 20:12 +0900 yuuji $
+;;; (c)1993-2022 by HIROSE Yuuji [yuuji@yatex.org]
+;;; Last modified Sun Dec 25 13:56:02 2022 on firestorm
+;;; $Id: yatexmth.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; Commentary:
;;; [Customization guide]
@@ -326,6 +326,8 @@
("ms" "mathsf" "\\mathsf{}")
("mc" "mathcal" "\\mathcal{}")
("mn" "mathnormal" "\\mathnormal{}")
+ ("di" "displaystyle" "\displaystyle")
+ ("ds" "displaystyle" "\displaystyle")
)
"Default LaTeX-math-command alist.")
diff --git a/yatexpkg.el b/yatexpkg.el
index f1ba4d6..75ff410 100644
--- a/yatexpkg.el
+++ b/yatexpkg.el
@@ -1,8 +1,8 @@
;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*-
;;;
-;;; (c)2003-2019 by HIROSE, Yuuji [yuuji@yatex.org]
-;;; Last modified Sat May 25 14:46:27 2019 on firestorm
-;;; $Id: yatexpkg.el,v 714f3527b4a1 2019-05-25 14:48 +0900 yuuji $
+;;; (c)2003-2022 by HIROSE, Yuuji [yuuji@yatex.org]
+;;; Last modified Fri Dec 2 08:22:41 2022 on firestorm
+;;; $Id: yatexpkg.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; Code:
(defvar YaTeX-package-ams-envs
@@ -28,7 +28,8 @@
("alltt" (env "alltt"))
("misc" (section "verbfile" "listing"))
("verbatim" (section "verbatiminput"))
- ("eclbkbox" (env "breakbox"))
+ ("boites" (env "breakbox"))
+ ;;("eclbkbox" (env "breakbox"))
("supertabular" (env "supertabular"))
("tabularx" (env "tabularx"))
("amsmath" (env . YaTeX-package-ams-envs)
@@ -44,6 +45,7 @@
("latexsym" (maketitle "mho" "Join" "Box" "Diamond" "leadsto"
"sqsubset" "sqsupset" "lhd" "unlhd" "rhd" "unrhd"))
("mathrsfs" (section "mathscr"))
+ ("fleqn" (env "nccmath"))
("graphicx" (section "includegraphics"
"rotatebox" "scalebox" "resizebox" "reflectbox")
(option . YaTeX-package-graphics-driver-alist))
@@ -76,6 +78,10 @@
("cases" (env "numcases" "subnumcases"))
("subfigure" (section "subfigure"))
("okumacro" (section "ruby" "kenten"))
+ ("colortbl" (section "columncolor" "rowcolor"))
+ ("booktab" (section "toprule" "midrule" "bottomrule" "cmidrule"
+ "addlinespace" "specialrule"))
+ ("pxbase" (section "UI"))
)
"Default package vs. macro list.
Alists contains '(PACKAGENAME . MACROLIST)
diff --git a/yatexprc.el b/yatexprc.el
index 6b48f79..cedfae2 100644
--- a/yatexprc.el
+++ b/yatexprc.el
@@ -1,8 +1,8 @@
;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*-
;;;
-;;; (c)1993-2019 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Thu Dec 26 12:48:12 2019 on firestorm
-;;; $Id: yatexprc.el,v 4dad5f91b26c 2019-12-26 12:50 +0859 yuuji $
+;;; (c)1993-2022 by HIROSE Yuuji.[yuuji@yatex.org]
+;;; Last modified Thu Dec 1 19:13:20 2022 on firestorm
+;;; $Id: yatexprc.el,v 5aa2610bd397 2022-12-25 14:12 +0900 yuuji $
;;; Code:
;(require 'yatex)
@@ -39,7 +39,8 @@
(cond
(YaTeX-dos (cdr (assq 1 YaTeX-kanji-code-alist)))
(YaTeX-emacs-20
- (cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist)))
+ (let ((sym (cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist))))
+ (if (eq sym 'no-conversion) 'undecided sym)))
((boundp 'MULE)
(symbol-value
(cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist))))
@@ -183,7 +184,8 @@ thus, it call bibtex only if warning messages about citation are seen.")
(ppprop (get 'YaTeX-typeset-process 'ppcmd))
(ppcmd (cdr (assq proc ppprop)))
(bcprop (get 'YaTeX-typeset-process 'bibcmd))
- (bibcmd (cdr (assq proc bcprop))))
+ (bibcmd (cdr (assq proc bcprop)))
+ (useluatex (string-match "lua.*tex" thiscmd)))
(put 'YaTeX-typeset-process 'ppcmd ;erase ppcmd
(delq (assq proc ppprop) ppprop))
(put 'YaTeX-typeset-process 'bibcmd ;erase bibcmd
@@ -285,8 +287,14 @@ thus, it call bibtex only if warning messages about citation are seen.")
;; If ppcmd is set and it is a function symbol,
;; call it whenever command succeeded or not
(funcall ppcmd))
- ((and ppcmd (string-match "finish" mes))
- (insert (format "=======> Success! Calling %s\n" ppcmd))
+ ((and ppcmd (string-match "finish" mes)
+ ;; It is bad way to detect the necessity of
+ ;; pdf-conversion by seeing typesetter name because
+ ;; new typesetter other than lua(la)tex might come.
+ ;; More reasonable way is to determine by the
+ ;; existence of PDF file.
+ (not useluatex))
+ (insert (format "=======> Success! Calling %s\n" ppcmd))
(setq mode-name ; set process name
(concat
mode-name "+"
@@ -1149,6 +1157,37 @@ by region."
t) ;for YaTeX-goto-corresponding-*
nil)))
+(and (or (featurep 'dbus) (load "dbus" t))
+ ;; Cannot load dbus on emacs without dbus module
+ (fboundp 'url-unhex-string)
+ (fboundp 'dbus-register-signal)
+ ;; From https://texwiki.texjp.org/?Emacs#vecb4fd9
+ (progn
+ (fset 'YaTeX-evince-inverse-search
+ (if (fboundp 'evince-inverse)
+ 'evince-inverse ;Use previously defined one
+ (function
+ (lambda (file linecol &rest args)
+ (let* ((fn (decode-coding-string
+ (url-unhex-string
+ (if (string-match "^file:///" file)
+ (substring file 7) file))
+ 'utf-8))
+ (buf (YaTeX-switch-to-buffer fn))
+ (ln (car linecol))
+ (col (car (cdr linecol))))
+ (if (null buf)
+ (error "[Synctex]: Not found [%s]" file)
+ (goto-line ln)
+ (move-to-column (max 0 col))))))))
+ (condition-case ()
+ (dbus-register-signal
+ :session nil "/org/gnome/evince/Window/0"
+ "org.gnome.evince.Window" "SyncSource"
+ 'YaTeX-evince-inverse-search)
+ (error
+ (message "Reverse search not available on this system.")))))
+
(defun YaTeX-set-virtual-error-position (file-sym line-sym)
"Replace the value of FILE-SYM, LINE-SYM by virtual error position."
(cond
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files