diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-27 23:13:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-27 23:13:13 +0000 |
commit | fe7545c610a029b24054ac26ee344cfb57834370 (patch) | |
tree | c1fa434d7f1d0a902935bb7bb2c67d84daefde00 /Master/texmf-dist/tex/latex/bxjscls | |
parent | 9ee28d233e2554f776311bd6120cc332fbc00985 (diff) |
bxjscls (27jan17)
git-svn-id: svn://tug.org/texlive/trunk@43064 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls')
10 files changed, 207 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 0795b850ae7..48a71504da8 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -743,6 +743,9 @@ \empty@sfcnt} \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. \bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} \def\@{\bxjs@SE{}} @@ -1110,13 +1113,13 @@ \mbox{} \\[1\jsZw] \large {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par - \smallskip + \jsc@smallskip \@title \ifx\bxjs@subtitle\@undefined\else \par\vskip\z@ {\small \bxjs@subtitle\par} \fi - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par \vfill {\small \@author}% @@ -1883,8 +1886,8 @@ \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup - \ifhmode\null\fi \ifx\pltx@foot@penalty\@undefined\else + \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else \penalty\pltx@foot@penalty \pltx@foot@penalty\z@ @@ -1900,26 +1903,35 @@ \AtBeginDocument{\everypar{\everyparhook}} \def\@inhibitglue{% \futurelet\@let@token\@@inhibitglue} +\begingroup +\let\GDEF=\gdef +\let\CATCODE=\catcode +\let\ENDGROUP=\endgroup +\CATCODE`k=12 +\CATCODE`a=12 +\CATCODE`n=12 +\CATCODE`j=12 +\CATCODE`i=12 +\CATCODE`c=12 +\CATCODE`h=12 +\CATCODE`r=12 +\CATCODE`t=12 +\CATCODE`e=12 +\GDEF\KANJI@CHARACTER{kanji character } +\ENDGROUP \def\@@inhibitglue{% - \ifx\@let@token「% - \jsInhibitGlue - \else - \ifx\@let@token(% - \jsInhibitGlue - \else - \ifx\@let@token『% - \jsInhibitGlue - \else - \ifx\@let@token[% - \jsInhibitGlue - \fi - \fi + \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} +\expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% + \def\bxjs@ig@temp{#1}% + \ifx\bxjs@ig@temp\@empty + \ifnum\the\inhibitxspcode`#2=2\relax + \inhibitglue \fi \fi} \def\@doendpe{% \@endpetrue \def\par{% - \@restorepar\everypar{\everyparhook}\par\@endpefalse}% + \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} \def\@item[#1]{% \if@noparitem @@ -2037,8 +2049,9 @@ \fi {% \newif\ifjsSeireki \jsSeirekitrue -\def\西暦{\jsSeirekitrue} -\def\和暦{\jsSeirekifalse} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\jsSeirekitrue}% + \def\和暦{\jsSeirekifalse}} \def\Seireki{\jsSeirekitrue} \def\Wareki{\jsSeirekifalse} \def\bxjs@if@use@seireki{% @@ -2046,14 +2059,16 @@ \else \expandafter\@secondoftwo \fi} }{% \newif\if西暦 \西暦true -\def\西暦{\西暦true} -\def\和暦{\西暦false} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\西暦true}% + \def\和暦{\西暦false}} \def\Seireki{\西暦true} \def\Wareki{\西暦false} \def\bxjs@if@use@seireki{% \if西暦 \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} } +\bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T @@ -2061,14 +2076,17 @@ \else \def\bxjs@iai{} \fi \newcount\heisei \heisei\year \advance\heisei-1988\relax -\edef\today{% +\edef\bxjs@today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifnum\heisei>\@ne + \expandafter\noexpand\expandafter\bxjs@if@use@seireki + \else \expandafter\@firstoftwo + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% @@ -2078,6 +2096,13 @@ \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }% \fi} +\let\today\bxjs@today +\AtBeginDocument{% + \ifx\bbl@jpn@Seirekitrue\@undefined\else + \bxjs@decl@Seireki@cmds + \g@addto@macro\datejapanese{% + \let\today\bxjs@today}% + \fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain}% \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index de1e09102da..b498b749ee7 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -747,6 +747,9 @@ \empty@sfcnt} \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. \bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} \def\@{\bxjs@SE{}} @@ -1126,13 +1129,13 @@ \mbox{} \\[1\jsZw] \large {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par - \smallskip + \jsc@smallskip \@title \ifx\bxjs@subtitle\@undefined\else \par\vskip\z@ {\small \bxjs@subtitle\par} \fi - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par \vfill {\small \@author}% @@ -1410,9 +1413,11 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside + \if@openright %% added (2016/12/13) \null \thispagestyle{empty}% \newpage + \fi %% added (2016/12/13) \fi \if@restonecol \twocolumn @@ -1972,8 +1977,8 @@ \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup - \ifhmode\null\fi \ifx\pltx@foot@penalty\@undefined\else + \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else \penalty\pltx@foot@penalty \pltx@foot@penalty\z@ @@ -1989,26 +1994,35 @@ \AtBeginDocument{\everypar{\everyparhook}} \def\@inhibitglue{% \futurelet\@let@token\@@inhibitglue} +\begingroup +\let\GDEF=\gdef +\let\CATCODE=\catcode +\let\ENDGROUP=\endgroup +\CATCODE`k=12 +\CATCODE`a=12 +\CATCODE`n=12 +\CATCODE`j=12 +\CATCODE`i=12 +\CATCODE`c=12 +\CATCODE`h=12 +\CATCODE`r=12 +\CATCODE`t=12 +\CATCODE`e=12 +\GDEF\KANJI@CHARACTER{kanji character } +\ENDGROUP \def\@@inhibitglue{% - \ifx\@let@token「% - \jsInhibitGlue - \else - \ifx\@let@token(% - \jsInhibitGlue - \else - \ifx\@let@token『% - \jsInhibitGlue - \else - \ifx\@let@token[% - \jsInhibitGlue - \fi - \fi + \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} +\expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% + \def\bxjs@ig@temp{#1}% + \ifx\bxjs@ig@temp\@empty + \ifnum\the\inhibitxspcode`#2=2\relax + \inhibitglue \fi \fi} \def\@doendpe{% \@endpetrue \def\par{% - \@restorepar\everypar{\everyparhook}\par\@endpefalse}% + \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} \def\@item[#1]{% \if@noparitem @@ -2127,8 +2141,9 @@ \fi {% \newif\ifjsSeireki \jsSeirekitrue -\def\西暦{\jsSeirekitrue} -\def\和暦{\jsSeirekifalse} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\jsSeirekitrue}% + \def\和暦{\jsSeirekifalse}} \def\Seireki{\jsSeirekitrue} \def\Wareki{\jsSeirekifalse} \def\bxjs@if@use@seireki{% @@ -2136,14 +2151,16 @@ \else \expandafter\@secondoftwo \fi} }{% \newif\if西暦 \西暦true -\def\西暦{\西暦true} -\def\和暦{\西暦false} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\西暦true}% + \def\和暦{\西暦false}} \def\Seireki{\西暦true} \def\Wareki{\西暦false} \def\bxjs@if@use@seireki{% \if西暦 \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} } +\bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T @@ -2151,14 +2168,17 @@ \else \def\bxjs@iai{} \fi \newcount\heisei \heisei\year \advance\heisei-1988\relax -\edef\today{% +\edef\bxjs@today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifnum\heisei>\@ne + \expandafter\noexpand\expandafter\bxjs@if@use@seireki + \else \expandafter\@firstoftwo + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% @@ -2168,6 +2188,13 @@ \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }% \fi} +\let\today\bxjs@today +\AtBeginDocument{% + \ifx\bbl@jpn@Seirekitrue\@undefined\else + \bxjs@decl@Seireki@cmds + \g@addto@macro\datejapanese{% + \let\today\bxjs@today}% + \fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{headings}% \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 40effe0ae60..b0905b61ad3 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a 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 afba34cb95e..90048f3a464 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a 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 43a6870f23a..7b663ff252a 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a 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 dab3e8dcf43..8c450d99ac6 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a 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 6106d45ef20..b2087657ddb 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] \input{bxjsja-standard.def} \@onlypreamble\bxjs@set@dupload@proc \def\bxjs@set@dupload@proc#1{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 462694092bd..e06a0bedec3 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -350,7 +350,7 @@ \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99992}>\m@ne \PassOptionsToPackage{unicode}{hyperref} \fi -\let\jsInhibitGlueAtParTop\@inhibitglue +\let\jsInhibitGlueAtParTop\@empty \newskip\jsKanjiSkip \newskip\jsXKanjiSkip \ifx\CJKecglue\@undefined diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 6d0324dd5a9..4f28c621902 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -747,6 +747,9 @@ \empty@sfcnt} \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. \bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} \def\@{\bxjs@SE{}} @@ -1109,13 +1112,13 @@ \mbox{} \\[1\jsZw] \large {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par - \smallskip + \jsc@smallskip \@title \ifx\bxjs@subtitle\@undefined\else \par\vskip\z@ {\small \bxjs@subtitle\par} \fi - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par \vfill {\small \@author}% @@ -1393,9 +1396,11 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside + \if@openright %% added (2016/12/13) \null \thispagestyle{empty}% \newpage + \fi %% added (2016/12/13) \fi \if@restonecol \twocolumn @@ -1955,8 +1960,8 @@ \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup - \ifhmode\null\fi \ifx\pltx@foot@penalty\@undefined\else + \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else \penalty\pltx@foot@penalty \pltx@foot@penalty\z@ @@ -1972,26 +1977,35 @@ \AtBeginDocument{\everypar{\everyparhook}} \def\@inhibitglue{% \futurelet\@let@token\@@inhibitglue} +\begingroup +\let\GDEF=\gdef +\let\CATCODE=\catcode +\let\ENDGROUP=\endgroup +\CATCODE`k=12 +\CATCODE`a=12 +\CATCODE`n=12 +\CATCODE`j=12 +\CATCODE`i=12 +\CATCODE`c=12 +\CATCODE`h=12 +\CATCODE`r=12 +\CATCODE`t=12 +\CATCODE`e=12 +\GDEF\KANJI@CHARACTER{kanji character } +\ENDGROUP \def\@@inhibitglue{% - \ifx\@let@token「% - \jsInhibitGlue - \else - \ifx\@let@token(% - \jsInhibitGlue - \else - \ifx\@let@token『% - \jsInhibitGlue - \else - \ifx\@let@token[% - \jsInhibitGlue - \fi - \fi + \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} +\expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% + \def\bxjs@ig@temp{#1}% + \ifx\bxjs@ig@temp\@empty + \ifnum\the\inhibitxspcode`#2=2\relax + \inhibitglue \fi \fi} \def\@doendpe{% \@endpetrue \def\par{% - \@restorepar\everypar{\everyparhook}\par\@endpefalse}% + \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} \def\@item[#1]{% \if@noparitem @@ -2110,8 +2124,9 @@ \fi {% \newif\ifjsSeireki \jsSeirekitrue -\def\西暦{\jsSeirekitrue} -\def\和暦{\jsSeirekifalse} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\jsSeirekitrue}% + \def\和暦{\jsSeirekifalse}} \def\Seireki{\jsSeirekitrue} \def\Wareki{\jsSeirekifalse} \def\bxjs@if@use@seireki{% @@ -2119,14 +2134,16 @@ \else \expandafter\@secondoftwo \fi} }{% \newif\if西暦 \西暦true -\def\西暦{\西暦true} -\def\和暦{\西暦false} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\西暦true}% + \def\和暦{\西暦false}} \def\Seireki{\西暦true} \def\Wareki{\西暦false} \def\bxjs@if@use@seireki{% \if西暦 \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} } +\bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T @@ -2134,14 +2151,17 @@ \else \def\bxjs@iai{} \fi \newcount\heisei \heisei\year \advance\heisei-1988\relax -\edef\today{% +\edef\bxjs@today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifnum\heisei>\@ne + \expandafter\noexpand\expandafter\bxjs@if@use@seireki + \else \expandafter\@firstoftwo + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% @@ -2151,6 +2171,13 @@ \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }% \fi} +\let\today\bxjs@today +\AtBeginDocument{% + \ifx\bbl@jpn@Seirekitrue\@undefined\else + \bxjs@decl@Seireki@cmds + \g@addto@macro\datejapanese{% + \let\today\bxjs@today}% + \fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain}% \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index d7f3ad3b4cb..fa5f6671767 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} - [2016/11/01 v1.3 BXJS document classes] + [2017/01/28 v1.3a BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -742,6 +742,9 @@ \empty@sfcnt} \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. \bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} \def\@{\bxjs@SE{}} @@ -1108,13 +1111,13 @@ \mbox{} \\[1\jsZw] \large {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par - \smallskip + \jsc@smallskip \@title \ifx\bxjs@subtitle\@undefined\else \par\vskip\z@ {\small \bxjs@subtitle\par} \fi - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par \vfill {\small \@author}% @@ -1881,8 +1884,8 @@ \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup - \ifhmode\null\fi \ifx\pltx@foot@penalty\@undefined\else + \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else \penalty\pltx@foot@penalty \pltx@foot@penalty\z@ @@ -1898,26 +1901,35 @@ \AtBeginDocument{\everypar{\everyparhook}} \def\@inhibitglue{% \futurelet\@let@token\@@inhibitglue} +\begingroup +\let\GDEF=\gdef +\let\CATCODE=\catcode +\let\ENDGROUP=\endgroup +\CATCODE`k=12 +\CATCODE`a=12 +\CATCODE`n=12 +\CATCODE`j=12 +\CATCODE`i=12 +\CATCODE`c=12 +\CATCODE`h=12 +\CATCODE`r=12 +\CATCODE`t=12 +\CATCODE`e=12 +\GDEF\KANJI@CHARACTER{kanji character } +\ENDGROUP \def\@@inhibitglue{% - \ifx\@let@token「% - \jsInhibitGlue - \else - \ifx\@let@token(% - \jsInhibitGlue - \else - \ifx\@let@token『% - \jsInhibitGlue - \else - \ifx\@let@token[% - \jsInhibitGlue - \fi - \fi + \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} +\expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% + \def\bxjs@ig@temp{#1}% + \ifx\bxjs@ig@temp\@empty + \ifnum\the\inhibitxspcode`#2=2\relax + \inhibitglue \fi \fi} \def\@doendpe{% \@endpetrue \def\par{% - \@restorepar\everypar{\everyparhook}\par\@endpefalse}% + \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} \def\@item[#1]{% \if@noparitem @@ -2035,8 +2047,9 @@ \fi {% \newif\ifjsSeireki \jsSeirekitrue -\def\西暦{\jsSeirekitrue} -\def\和暦{\jsSeirekifalse} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\jsSeirekitrue}% + \def\和暦{\jsSeirekifalse}} \def\Seireki{\jsSeirekitrue} \def\Wareki{\jsSeirekifalse} \def\bxjs@if@use@seireki{% @@ -2044,14 +2057,16 @@ \else \expandafter\@secondoftwo \fi} }{% \newif\if西暦 \西暦true -\def\西暦{\西暦true} -\def\和暦{\西暦false} +\def\bxjs@decl@Seireki@cmds{% + \def\西暦{\西暦true}% + \def\和暦{\西暦false}} \def\Seireki{\西暦true} \def\Wareki{\西暦false} \def\bxjs@if@use@seireki{% \if西暦 \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} } +\bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T @@ -2059,14 +2074,17 @@ \else \def\bxjs@iai{} \fi \newcount\heisei \heisei\year \advance\heisei-1988\relax -\edef\today{% +\edef\bxjs@today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifnum\heisei>\@ne + \expandafter\noexpand\expandafter\bxjs@if@use@seireki + \else \expandafter\@firstoftwo + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% @@ -2076,6 +2094,13 @@ \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }% \fi} +\let\today\bxjs@today +\AtBeginDocument{% + \ifx\bbl@jpn@Seirekitrue\@undefined\else + \bxjs@decl@Seireki@cmds + \g@addto@macro\datejapanese{% + \let\today\bxjs@today}% + \fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{empty}% \pagenumbering{arabic} |