diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-27 21:55:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-27 21:55:57 +0000 |
commit | 7d7eb887add6ead3e9948d474d422409245d46e8 (patch) | |
tree | 78e574f28230c83ef816a466ebf9943776e03362 /Master | |
parent | a694db8b262f351330c56f4ac85b3ee8fea86f09 (diff) |
ieejtran (27jan23)
git-svn-id: svn://tug.org/texlive/trunk@65641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/bibtex/bst/ieejtran/IEEJtran.bst | 23 | ||||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.pdf | bin | 29797 -> 29867 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.pdf | bin | 114361 -> 115666 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/bibtex/ieejtran/mixej.py | 4 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
8 files changed, 20 insertions, 14 deletions
diff --git a/Master/texmf-dist/bibtex/bst/ieejtran/IEEJtran.bst b/Master/texmf-dist/bibtex/bst/ieejtran/IEEJtran.bst index ae939010367..dc77f4fabe5 100644 --- a/Master/texmf-dist/bibtex/bst/ieejtran/IEEJtran.bst +++ b/Master/texmf-dist/bibtex/bst/ieejtran/IEEJtran.bst @@ -2,9 +2,9 @@ %% IEEJtran.bst %% BibTeX Bibliography Style file for IEEJ Journals and Conferences (unsorted) %% -%% Version 0.18 (2022/03/26) +%% Version 0.19 (2023/01/26) %% -%% Copyright (c) 2020-2022 Haruki Ejiri and Yoshi Ri +%% Copyright (c) 2020-2023 Haruki Ejiri and Yoshi Ri %% %% Original starting code base and algorithms obtained from the output of %% Patrick W. Daly's makebst package as well as from prior versions of @@ -68,8 +68,8 @@ % FUNCTION{bst.file.name} { "IEEJtran.bst" } -FUNCTION{bst.file.version} { "0.18" } -FUNCTION{bst.file.date} { "2022/03/26" } +FUNCTION{bst.file.version} { "0.19" } +FUNCTION{bst.file.date} { "2023/01/26" } FUNCTION{bst.file.website} { "https://github.com/ehki/jIEEEtran/" } FUNCTION{bst.file.author} { "Haruki Ejiri and Yoshi Ri" } @@ -646,7 +646,7 @@ INTEGERS { prev.status.punct this.status.punct punct.std cap.no cap.yes japanese.flag} -INTEGERS { longest.label.width multiresult nameptr namesleft number.label numnames } +INTEGERS { longest.label.width multiresult nameptr namesleft number.label numnames n} INTEGERS { is.use.number.for.article is.use.paper @@ -1603,9 +1603,14 @@ FUNCTION {author.sep} FUNCTION {author.sep.last} -{ use.ieej.setting #0 = - { japanese.flag #0 = % IEEE 形式の場合、and の取り扱いに注意 - { ", " * bbl.and space.word } % 英語ではカンマの後 and を挿入 +{ 'n := + use.ieej.setting #0 = + { japanese.flag #0 = % IEEE 形式の場合、andの取り扱いに注意 + { n #2 > + { ", " * bbl.and space.word } % 英語で著者が2人より多い場合、カンマの後に and を挿入 + { "" * bbl.and space.word } % 英語で著者が2人以下の場合、カンマなしで and を挿入 + if$ + } { "," } % 日本語では他と同様に全角カンマのみ if$ } @@ -1869,7 +1874,7 @@ FUNCTION {format.names} { " " * bbl.etal emphasize } if$ * } - { author.sep.last * t do.name.latex.cmd * } + { numnames author.sep.last * t do.name.latex.cmd * } if$ } if$ diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/README b/Master/texmf-dist/doc/bibtex/ieejtran/README index 643f36b7be0..6707d926ae2 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/README +++ b/Master/texmf-dist/doc/bibtex/ieejtran/README @@ -1,4 +1,4 @@ -March 26, 2021 +January 26, 2023 IEEJtran is an UNOFFICIAL BibTeX style for authors of the Institute of diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.pdf b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.pdf Binary files differindex 70f66605ad7..679d089959e 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.pdf +++ b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.pdf diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.tex b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.tex index 2fa8a6af27e..8b095c5d1e7 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.tex +++ b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran-en.tex @@ -27,7 +27,7 @@ \end{filecontents} -\title{\texttt{IEEJtran.bst}:\\Unofficial IEEJ \BibTeX\ style\\(ver. 0.18)} +\title{\texttt{IEEJtran.bst}:\\Unofficial IEEJ \BibTeX\ style\\(ver. 0.19)} \author{Haruki EJIRI} \begin{document} diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.pdf b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.pdf Binary files differindex 0d0184d6d10..b373a138fef 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.pdf +++ b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.pdf diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.tex b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.tex index 042595eb11d..b83e8196eba 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.tex +++ b/Master/texmf-dist/doc/bibtex/ieejtran/ieejtran.tex @@ -223,7 +223,7 @@ \end{filecontents} -\title{\texttt{IEEJtran.bst}:\\電気学会非公式\BibTeX スタイル\\(ver. 0.18)} +\title{\texttt{IEEJtran.bst}:\\電気学会非公式\BibTeX スタイル\\(ver. 0.19)} \author{江尻 開} \begin{document} diff --git a/Master/texmf-dist/doc/bibtex/ieejtran/mixej.py b/Master/texmf-dist/doc/bibtex/ieejtran/mixej.py index f96dbf6f482..4220f518553 100644 --- a/Master/texmf-dist/doc/bibtex/ieejtran/mixej.py +++ b/Master/texmf-dist/doc/bibtex/ieejtran/mixej.py @@ -7,8 +7,8 @@ import logging SPLIT_KEY = '/ej/' ITEM_SEP = '\\hspace{0mm}\\\\' -FILE_VERSION = '0.18' -FILE_DATE = '2022/03/26' +FILE_VERSION = '0.19' +FILE_DATE = '2023/01/26' FILE_AUTHOR = 'Haruki Ejiri' FILE_URL = 'https://github.com/ehki/jIEEEtran/' diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 7af990399ff..cc11fa42045 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2118,6 +2118,7 @@ $standardtex 'hyphenex', 'ushyphex\.tex', 'hyplain', '(hyrules|hy.*plain|hylang)\..*', 'ibygrk', 'iby4extr.tex|ibycus4.tex|ibycusps.tex|pssetiby.tex|setiby4.tex|tlgsqq.tex|version4.tex|' . $standardtex, + 'ieejtran', 'NULL', # not .py 'ifmslide', '[^n]\.(eps|pdf|jpg)|' . $standardtex, # not ifmman.pdf 'ijsra', 'ijsra_logo.*|' . $standardtex, 'insbox', 'insbox.tex', |