From d310a5884150cb8753e7fbea759cc579c2a305b4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Apr 2018 22:40:21 +0000 Subject: bxjscls (30apr18) git-svn-id: svn://tug.org/texlive/trunk@47517 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/bxjscls/bxjsja-minimal.def | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index 13532504376..040e4bb7a3a 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/29 v1.8a BXJS document classes] + [2018/04/19 v1.9 BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% @@ -42,7 +42,7 @@ \@onlypreamble\bxjs@if@sf@default \def\bxjs@if@sf@default#1{% \ifx\familydefault\bxjs@@CSsfdefault#1\fi - \AtBeginDocument{% + \g@addto@macro\bxjs@begin@document@hook{% \ifx\familydefault\bxjs@@CSsfdefault#1\fi}% } \@tempdima\p@ \bxjs@invscale\@tempdima\jsScale @@ -141,17 +141,17 @@ } \def\bxjs@sizereference{jis} \fi -\def\bxjs@tmpa#1/#2/#3/#4/#5\relax{% - \def\bxjs@y{#5}} -\ifjsWithpTeXng \def\bxjs@y{10}% +\def\bxjs@next#1/#2/#3/#4/#5\relax{% + \def\bxjs@tmpb{#5}} +\ifjsWithpTeXng \def\bxjs@tmpb{10}% \else -\expandafter\expandafter\expandafter\bxjs@tmpa +\expandafter\expandafter\expandafter\bxjs@next \expandafter\string\the\jfont\relax \fi -\@for\bxjs@x:={\jsc@JYn/mc/m/n,\jsc@JYn/gt/m/n,% +\@for\bxjs@tmpa:={\jsc@JYn/mc/m/n,\jsc@JYn/gt/m/n,% \jsc@JTn/mc/m/n,\jsc@JTn/gt/m/n}\do - {\expandafter\let\csname\bxjs@x/10\endcsname=\@undefined - \expandafter\let\csname\bxjs@x/\bxjs@y\endcsname=\@undefined} + {\expandafter\let\csname\bxjs@tmpa/10\endcsname=\@undefined + \expandafter\let\csname\bxjs@tmpa/\bxjs@tmpb\endcsname=\@undefined} \begingroup \font\bxjs@tmpa=\bxjs@sizereference\space at 10pt \setbox\z@\hbox{\bxjs@tmpa\char\jis"2121\relax} @@ -243,7 +243,7 @@ \relax}% \let\bxjs@cjk@loaded\relax } -\AtBeginDocument{% +\g@addto@macro\bxjs@begin@document@hook{% \@ifpackageloaded{CJK}{% \bxjs@cjk@loaded }{}% @@ -257,6 +257,7 @@ \def\bxjs@let@hchar@chr@xe#1{% \lccode`0=`#1\relax \lowercase{\bxjs@let@hchar@out\def{{0}}}} +\@onlypreamble\bxjs@do@precisetext \ifx\XeTeXgenerateactualtext\@undefined\else \def\bxjs@do@precisetext{% \XeTeXgenerateactualtext=\@ne} @@ -275,7 +276,7 @@ \XeTeXlinebreakpenalty=0\relax} \fi\fi\fi \ifx\bxjs@do@simplejasetup\@undefined\else - \AtBeginDocument{% + \g@addto@macro\bxjs@begin@document@hook{% \ifbxjs@simplejasetup \bxjs@do@simplejasetup \fi} @@ -283,21 +284,19 @@ \ifbxjs@precisetext \ifx\bxjs@do@precisetext\@undefined \ClassWarning\bxjs@clsname - {The current engine does not supprt the\MessageBreak - 'precisetext' option\@gobble} + {The current engine does not support the\MessageBreak + 'precise-text' option\@gobble} \else \bxjs@do@precisetext \fi \fi -\@onlypreamble\bxjs@check@everyparhook -\def\bxjs@check@everyparhook{% +\g@addto@macro\bxjs@begin@document@hook{% \ifx\jsInhibitGlueAtParTop\@empty \def\bxjs@tmpa{\jsInhibitGlueAtParTop}% \ifx\everyparhook\bxjs@tmpa \let\everyparhook\@empty \fi \fi} -\AtBeginDocument{\bxjs@check@everyparhook} \ifnum\bxjs@everyparhook=\bxjs@everyparhook@modern \let\bxjs@everypar\everypar \newtoks\everypar @@ -338,7 +337,7 @@ \let\bxjs@org@pagestyle\pagestyle \def\pagestyle{% \bxjs@pagestyle@hook \bxjs@org@pagestyle} -\AtBeginDocument{% +\g@addto@macro\bxjs@begin@document@hook{% \bxjs@pagestyle@hook \global\let\bxjs@pagestyle@hook\relax} \ifbxjs@jaspace@cmd -- cgit v1.2.3