bxjscls (4sep18)

git-svn-id: svn://tug.org/texlive/trunk@48576 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 14 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 7304823a6d2..b051929376c 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/08/20 v1.9b BXJS document classes]
+  [2018/09/04 v1.9c BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsreport}
 \newif\ifjsc@needsp@tch
@@ -87,6 +87,11 @@
 \let\PackageWarningNoLine\bxjs@tmpa
 \@nameuse{RevokeOldLuaTeXBehavior}
 \let\ifjsInPdfMode\ifpdf
+\newif\ifbxjs@TUenc
+\def\bxjs@tmpa{TU}\edef\bxjs@tmpb{\f@encoding}
+\ifx\bxjs@tmpa\bxjs@tmpb
+  \bxjs@TUenctrue
+\fi
 \@gobbletwo\if\if \def\bxjs@cond#1\fi{%
   #1\expandafter\@firstoftwo
   \else\expandafter\@secondoftwo
@@ -855,7 +860,11 @@
 \ifjsc@mag@xreal
   \RequirePackage{type1cm}
   \let\jsc@invscale\bxjs@invscale
-  \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+  \ifbxjs@TUenc
+    \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
+  \else
+    \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+  \fi
   \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
   \let\jsc@get@external@font\get@external@font
   \def\get@external@font{%
@@ -891,7 +900,9 @@
     \edef\mandatory@arg{%
       \mandatory@arg\expandafter\genb@x\jsc@cref@size..\@@}%
     \empty@sfcnt}
-  \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+  \ifbxjs@TUenc\else
+    \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+  \fi
 \fi
 \def\jsc@smallskip{\vspace\jsc@smallskipamount}
 \newskip\jsc@smallskipamount