From 5153629e4009236fef4bc7efb52ada2f825c4a56 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Jul 2019 21:07:18 +0000 Subject: bxjscls (27jul19) git-svn-id: svn://tug.org/texlive/trunk@51758 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bxjscls/LICENSE | 2 +- Master/texmf-dist/doc/latex/bxjscls/README-ja.md | 3 +++ Master/texmf-dist/doc/latex/bxjscls/README.md | 1 + .../doc/latex/bxjscls/bxjscls-manual.pdf | Bin 636287 -> 635563 bytes .../doc/latex/bxjscls/bxjscls-manual.tex | 8 ++++---- Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf | Bin 1051978 -> 1051568 bytes Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx | 20 +++++++++++--------- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 8 ++++---- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 8 ++++---- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../tex/latex/bxjscls/bxjsja-standard.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 8 ++++---- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 8 ++++---- 18 files changed, 43 insertions(+), 37 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bxjscls/LICENSE b/Master/texmf-dist/doc/latex/bxjscls/LICENSE index c18e3ecedd7..4e794feb3a9 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/LICENSE +++ b/Master/texmf-dist/doc/latex/bxjscls/LICENSE @@ -2,7 +2,7 @@ The BSD 2-Clause License Copyright 1995-1999 ASCII Corporation. Copyright 1999-2016 Haruhiko Okumura -Copyright 2016-2018 Japanese TeX Development Community +Copyright 2016-2019 Japanese TeX Development Community Copyright 2013-2019 Takayuki YATO (aka. "ZR") All rights reserved. diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md index b99838fa24a..5dce4a844e8 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md @@ -98,6 +98,9 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使 更新履歴 -------- + * Version 1.9h 〈2019/07/27〉 + - jsclasses の 2019/07/25 と同期。 + - バグ修正。 * Version 1.9g 〈2019/06/23〉 - バグ修正。 * Version 1.9f 〈2019/03/10〉 diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md index 505e06674fd..c0071f88245 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README.md @@ -88,6 +88,7 @@ This package is distributed under the BSD 2-Clause License. Revision History ---------------- + * Version 1.9h 〈2019/07/27〉 * Version 1.9g 〈2019/06/23〉 * Version 1.9f 〈2019/03/10〉 * Version 1.9e 〈2019/01/13〉 diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf index f8ad16ea56c..00b4706eec5 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex index 0e15ea7bf9d..fd0a4a019de 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex @@ -12,8 +12,8 @@ \renewcommand*{\XeLaTeX}{XeLaTeX}} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.9g} -\newcommand{\PkgDate}{2019/06/23} +\newcommand{\PkgVersion}{1.9h} +\newcommand{\PkgDate}{2019/07/27} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} @@ -171,7 +171,7 @@ JSクラスのレイアウトデザインと機能をほぼ踏襲しているが 例えば次の設定は: \begin{quote}\small\begin{verbatim} -\documentclass[a5paper,uplatex,dvipdfmx,ja=standard]{bxjsarticle} +\documentclass[a4paper,uplatex,dvipdfmx,ja=standard]{bxjsarticle} \end{verbatim}\end{quote} 次の設定とほぼ等価になる \footnote{論理フォントについては、従来のもの @@ -592,7 +592,7 @@ JSクラスには無くBXJSクラスで追加されたクラスオプション それ以外の場合は、一応 |minimal| とするが、 明示的な指定が推奨される。 \item |jafont=|\Meta{名前}\Means - 「和文フォントプリセット指定」の名雨を設定する。 + 「和文フォントプリセット指定」の名前を設定する。 \Note \ref{sec:Basic}節で解説した通り、standard和文ドライバでは |jafont| の値が利用される。 \par diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf index f3236d17e2c..bc7df6ed8d3 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf differ diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx index 118a5154ab1..c46d0fd9b79 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx @@ -31,7 +31,7 @@ % % Copyright 1995-1999 ASCII Corporation. % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016-2018 Japanese TeX Development Community +% Copyright 2016-2019 Japanese TeX Development Community % % Copyright 2013-2019 Takayuki YATO (aka. "ZR") % @@ -56,7 +56,9 @@ %<*driver> \ProvidesFile{bxjscls.dtx} % - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] +% based on jsclasses [2019/07/25] +% [2019/06/23 v1.9g BXJS document classes] % [2019/03/10 v1.9f BXJS document classes] % [2019/01/13 v1.9e BXJS document classes] % [2018/10/03 v1.9d BXJS document classes] @@ -5850,9 +5852,9 @@ % \begin{macrocode} \def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@} \newcommand*{\jsInJaParen}[1]{% - \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust} + \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust} \newcommand{\labelenumi}{\theenumi.} -\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}} +\newcommand{\labelenumii}{\jsInJaParen{\theenumii}} \newcommand{\labelenumiii}{\theenumiii.} \newcommand{\labelenumiv}{\theenumiv.} % \end{macrocode} @@ -5871,7 +5873,7 @@ % % \begin{macrocode} \renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)} +\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )} \renewcommand{\p@enumiv}{\p@enumiii\theenumiii} % \end{macrocode} % \end{macro} @@ -6313,7 +6315,7 @@ % 数式番号の形式です。 % デフォルトの値をコメントアウトして示しておきます。 % -% |\jsInhibitGlue(\theequation)\jsInhibitGlue| のように和文かっこ +% |\jsInhibitGlue (\theequation )\jsInhibitGlue| のように和文かっこ % を使うことも可能です。 % % \begin{macrocode} @@ -6324,7 +6326,7 @@ % |amsmath| パッケージを使う場合は |\tagform@| を次のように修正します。 % % \begin{macrocode} -% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr )}} % \end{macrocode} % % \subsection{フロート} @@ -7177,7 +7179,7 @@ % とりあえずコメントアウトしておきますので,必要に応じて生かしてください。 % % \begin{macrocode} -% \def\@biblabel#1{\jsInhibitGlue[#1]\jsInhibitGlue} +% \def\@biblabel#1{\jsInhibitGlue [#1]\jsInhibitGlue} % \end{macrocode} % \end{macro} % @@ -7204,7 +7206,7 @@ % \@latex@warning % {Citation `\@citeb' on page \thepage \space undefined}}% % {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}} -% \def\@cite#1#2{\jsInhibitGlue[{#1\if@tempswa ,#2\fi}]\jsInhibitGlue} +% \def\@cite#1#2{\jsInhibitGlue [{#1\if@tempswa ,#2\fi}]\jsInhibitGlue} % \end{macrocode} % % 引用番号を上ツキの 1)のようなスタイルにするには次のようにします。 diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index a97467aa5fa..01952a192f9 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -1713,13 +1713,13 @@ \renewcommand{\theenumiv}{\@Alph\c@enumiv} \def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@} \newcommand*{\jsInJaParen}[1]{% - \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust} + \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust} \newcommand{\labelenumi}{\theenumi.} -\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}} +\newcommand{\labelenumii}{\jsInJaParen{\theenumii}} \newcommand{\labelenumiii}{\theenumiii.} \newcommand{\labelenumiv}{\theenumiv.} \renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)} +\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )} \renewcommand{\p@enumiv}{\p@enumiii\theenumiii} \newcommand\labelitemi{\textbullet} \newcommand\labelitemii{\normalfont\bfseries \textendash} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index e906f72ec64..d8baa6f5842 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -1838,13 +1838,13 @@ \renewcommand{\theenumiv}{\@Alph\c@enumiv} \def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@} \newcommand*{\jsInJaParen}[1]{% - \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust} + \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust} \newcommand{\labelenumi}{\theenumi.} -\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}} +\newcommand{\labelenumii}{\jsInJaParen{\theenumii}} \newcommand{\labelenumiii}{\theenumiii.} \newcommand{\labelenumiv}{\theenumiv.} \renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)} +\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )} \renewcommand{\p@enumiv}{\p@enumiii\theenumiii} \newcommand\labelitemi{\textbullet} \newcommand\labelitemii{\normalfont\bfseries \textendash} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index a04b30ca883..8802594f910 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscjkcat} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \@onlypreamble\bxjx@tmpdo diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty index 942ca63460a..5629b9f0f58 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscompat} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] \def\bxac@pkgname{bxjscompat} \let\bxac@engine=n \def\bxac@do#1#2{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index e0656824373..cc95dceaacb 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-minimal.def} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index b5dd213d214..61597297920 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-modern.def} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] \input{bxjsja-standard.def} \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@ \def\encodingdefault{T1}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def index 6310cb24be4..4e4c9f10abd 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-pandoc.def} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@endpreamble@hook diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 67a067c5de6..6fc5f845737 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-standard.def} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index e005933c0ed..721f638a990 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjspandoc} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 908e2d12661..26d3bec0cd4 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -1812,13 +1812,13 @@ \renewcommand{\theenumiv}{\@Alph\c@enumiv} \def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@} \newcommand*{\jsInJaParen}[1]{% - \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust} + \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust} \newcommand{\labelenumi}{\theenumi.} -\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}} +\newcommand{\labelenumii}{\jsInJaParen{\theenumii}} \newcommand{\labelenumiii}{\theenumiii.} \newcommand{\labelenumiv}{\theenumiv.} \renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)} +\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )} \renewcommand{\p@enumiv}{\p@enumiii\theenumiii} \newcommand\labelitemi{\textbullet} \newcommand\labelitemii{\normalfont\bfseries \textendash} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 2baf22f5d09..ff2392dfe32 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2019/06/23 v1.9g BXJS document classes] + [2019/07/27 v1.9h BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -1711,13 +1711,13 @@ \renewcommand{\theenumiv}{\@Alph\c@enumiv} \def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@} \newcommand*{\jsInJaParen}[1]{% - \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust} + \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust} \newcommand{\labelenumi}{\theenumi.} -\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}} +\newcommand{\labelenumii}{\jsInJaParen{\theenumii}} \newcommand{\labelenumiii}{\theenumiii.} \newcommand{\labelenumiv}{\theenumiv.} \renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)} +\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )} \renewcommand{\p@enumiv}{\p@enumiii\theenumiii} \newcommand\labelitemi{\textbullet} \newcommand\labelitemii{\normalfont\bfseries \textendash} -- cgit v1.2.3