diff options
Diffstat (limited to 'Master/texmf-dist/tex')
11 files changed, 53 insertions, 49 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 5fad2575f07..6539e7729df 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -473,7 +473,7 @@ \define@key{bxjs}{scale}{% \edef\bxjs@scale@opt{#1}% \let\jsScale\bxjs@scale@opt} -\define@key{bxjs}{jsfontscale}{\setkeys{bxjs}{scale=#1}} +\define@key{bxjs}{jafontscale}{\setkeys{bxjs}{scale=#1}} \DeclareOption{noscale}{\setkeys{bxjs}{scale=1}} \let\bxjs@param@mag\relax \define@key{bxjs}{mag}{\edef\bxjs@param@mag{#1}} @@ -999,13 +999,13 @@ \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} -\setlength\columnseprule{0\jsc@mpt} +\setlength\columnseprule{\z@} \setlength\lineskip{1\jsc@mpt} \setlength\normallineskip{1\jsc@mpt} \setlength\lineskiplimit{1\jsc@mpt} \setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\jsc@mpt} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\p@} \else @@ -2088,12 +2088,12 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces}% - \futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \else \let\next\f@t\fi \next} -\def\f@@t{\bgroup\aftergroup\@foot\let\next} -\def\f@t#1{#1\@foot} -\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup + \futurelet\jsc@next\jsc@fo@t} +\def\jsc@fo@t{\ifcat\bgroup\noexpand\jsc@next \let\jsc@next\jsc@f@@t + \else \let\jsc@next\jsc@f@t\fi \jsc@next} +\def\jsc@f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc@next} +\def\jsc@f@t#1{#1\jsc@@foot} +\def\jsc@@foot{\@finalstrut\strutbox\color@endgroup\egroup \ifx\pltx@foot@penalty\@undefined\else \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 1bd2325456d..ff744f4cfb9 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -479,7 +479,7 @@ \define@key{bxjs}{scale}{% \edef\bxjs@scale@opt{#1}% \let\jsScale\bxjs@scale@opt} -\define@key{bxjs}{jsfontscale}{\setkeys{bxjs}{scale=#1}} +\define@key{bxjs}{jafontscale}{\setkeys{bxjs}{scale=#1}} \DeclareOption{noscale}{\setkeys{bxjs}{scale=1}} \let\bxjs@param@mag\relax \define@key{bxjs}{mag}{\edef\bxjs@param@mag{#1}} @@ -1008,13 +1008,13 @@ \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} -\setlength\columnseprule{0\jsc@mpt} +\setlength\columnseprule{\z@} \setlength\lineskip{1\jsc@mpt} \setlength\normallineskip{1\jsc@mpt} \setlength\lineskiplimit{1\jsc@mpt} \setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\jsc@mpt} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\p@} \else @@ -1083,6 +1083,10 @@ \@tempdima=\jsTextWidthLimit\Cwd \ifx\bxjs@textwidth@opt\@undefined\else \jsSetQHLength\@tempdima{\bxjs@textwidth@opt} + \ifbxjs@whole@zw@lines + \advance\@tempdima.005pt\relax + \divide\@tempdima\Cwd \multiply\@tempdima\Cwd + \fi \fi \ifdim\textwidth>\@tempdima \textwidth=\@tempdima @@ -1830,7 +1834,7 @@ \begin{list}{}{% \listparindent=1\jsZw \itemindent=\listparindent - \rightmargin=\z@ + \rightmargin=0pt \leftmargin=5\jsZw}\item[]}{\end{list}\vspace{\baselineskip}} \ifbxjs@force@chapterabstract \let\abstract\chapterabstract @@ -2183,12 +2187,12 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces}% - \futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \else \let\next\f@t\fi \next} -\def\f@@t{\bgroup\aftergroup\@foot\let\next} -\def\f@t#1{#1\@foot} -\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup + \futurelet\jsc@next\jsc@fo@t} +\def\jsc@fo@t{\ifcat\bgroup\noexpand\jsc@next \let\jsc@next\jsc@f@@t + \else \let\jsc@next\jsc@f@t\fi \jsc@next} +\def\jsc@f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc@next} +\def\jsc@f@t#1{#1\jsc@@foot} +\def\jsc@@foot{\@finalstrut\strutbox\color@endgroup\egroup \ifx\pltx@foot@penalty\@undefined\else \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 9dac9a4767c..0e17f16b345 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \let\bxjx@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty index f809e173920..d6328630024 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a 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 fb4b292fd58..13532504376 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a 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 66db17297bc..2a3258cdca3 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a 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 781af49b0f9..b07b1b68a07 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@set@dupload@proc diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 8d3dadeede5..592bf6a07a7 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a 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 e2396410491..c6b88c6405d 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a 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 0081e761935..86e632f6b97 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -479,7 +479,7 @@ \define@key{bxjs}{scale}{% \edef\bxjs@scale@opt{#1}% \let\jsScale\bxjs@scale@opt} -\define@key{bxjs}{jsfontscale}{\setkeys{bxjs}{scale=#1}} +\define@key{bxjs}{jafontscale}{\setkeys{bxjs}{scale=#1}} \DeclareOption{noscale}{\setkeys{bxjs}{scale=1}} \let\bxjs@param@mag\relax \define@key{bxjs}{mag}{\edef\bxjs@param@mag{#1}} @@ -1007,13 +1007,13 @@ \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} -\setlength\columnseprule{0\jsc@mpt} +\setlength\columnseprule{\z@} \setlength\lineskip{1\jsc@mpt} \setlength\normallineskip{1\jsc@mpt} \setlength\lineskiplimit{1\jsc@mpt} \setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\jsc@mpt} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\p@} \else @@ -1814,7 +1814,7 @@ \begin{list}{}{% \listparindent=1\jsZw \itemindent=\listparindent - \rightmargin=\z@ + \rightmargin=0pt \leftmargin=5\jsZw}\item[]}{\end{list}\vspace{\baselineskip}} \newbox\@abstractbox \if@titlepage @@ -2215,12 +2215,12 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces}% - \futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \else \let\next\f@t\fi \next} -\def\f@@t{\bgroup\aftergroup\@foot\let\next} -\def\f@t#1{#1\@foot} -\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup + \futurelet\jsc@next\jsc@fo@t} +\def\jsc@fo@t{\ifcat\bgroup\noexpand\jsc@next \let\jsc@next\jsc@f@@t + \else \let\jsc@next\jsc@f@t\fi \jsc@next} +\def\jsc@f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc@next} +\def\jsc@f@t#1{#1\jsc@@foot} +\def\jsc@@foot{\@finalstrut\strutbox\color@endgroup\egroup \ifx\pltx@foot@penalty\@undefined\else \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index bd9d15db150..4f1e4290376 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} - [2018/03/03 v1.8 BXJS document classes] + [2018/03/29 v1.8a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -473,7 +473,7 @@ \define@key{bxjs}{scale}{% \edef\bxjs@scale@opt{#1}% \let\jsScale\bxjs@scale@opt} -\define@key{bxjs}{jsfontscale}{\setkeys{bxjs}{scale=#1}} +\define@key{bxjs}{jafontscale}{\setkeys{bxjs}{scale=#1}} \DeclareOption{noscale}{\setkeys{bxjs}{scale=1}} \let\bxjs@param@mag\relax \define@key{bxjs}{mag}{\edef\bxjs@param@mag{#1}} @@ -998,13 +998,13 @@ \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} -\setlength\columnseprule{0\jsc@mpt} +\setlength\columnseprule{\z@} \setlength\lineskip{1\jsc@mpt} \setlength\normallineskip{1\jsc@mpt} \setlength\lineskiplimit{1\jsc@mpt} \setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\jsc@mpt} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\p@} \else @@ -2086,12 +2086,12 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces}% - \futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \else \let\next\f@t\fi \next} -\def\f@@t{\bgroup\aftergroup\@foot\let\next} -\def\f@t#1{#1\@foot} -\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup + \futurelet\jsc@next\jsc@fo@t} +\def\jsc@fo@t{\ifcat\bgroup\noexpand\jsc@next \let\jsc@next\jsc@f@@t + \else \let\jsc@next\jsc@f@t\fi \jsc@next} +\def\jsc@f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc@next} +\def\jsc@f@t#1{#1\jsc@@foot} +\def\jsc@@foot{\@finalstrut\strutbox\color@endgroup\egroup \ifx\pltx@foot@penalty\@undefined\else \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else |