texlive[48576] Master/texmf-dist: bxjscls (4sep18)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 4 23:13:16 CEST 2018
Revision: 48576
http://tug.org/svn/texlive?view=revision&revision=48576
Author: karl
Date: 2018-09-04 23:13:16 +0200 (Tue, 04 Sep 2018)
Log Message:
-----------
bxjscls (4sep18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2018-09-04 21:13:16 UTC (rev 48576)
@@ -98,6 +98,9 @@
更新履歴
--------
+ * Version 1.9c 〈2018/09/04〉
+ - pandoc 和文ドライバの Babel 対策を改良。
+ - バグ修正。
* Version 1.9b 〈2018/08/20〉
- バグ修正。
* Version 1.9a 〈2018/07/20〉
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2018-09-04 21:13:16 UTC (rev 48576)
@@ -12,8 +12,8 @@
\renewcommand*{\XeLaTeX}{XeLaTeX}}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{v1.9b}
-\newcommand{\PkgDate}{2018/08/20}
+\newcommand{\PkgVersion}{1.9c}
+\newcommand{\PkgDate}{2018/09/04}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2018-09-04 21:13:16 UTC (rev 48576)
@@ -56,7 +56,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
+% [2018/08/20 v1.9b BXJS document classes]
% [2018/07/20 v1.9a BXJS document classes]
% based on jsclasses [2018/06/23]
% [2018/04/19 v1.9 BXJS document classes]
@@ -444,6 +445,24 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ifbxjs at TUenc}
+% 〔スイッチ〕
+% {\LaTeX}の既定のフォントエンコーディングがTUであるか。
+% \Note 2017年1月以降の{\LaTeX}カーネルにおいて
+% 「Unicodeを表す{\LaTeX}公式のフォントエンコーディング」
+% である“TU”が導入され、
+% これ以降の{\LaTeX}を{\XeTeX}またはLua{\TeX}で動かしている場合は、
+% 既定のエンコーディングがTUになる。
+% それ以外の場合は、既定のエンコーディングはOT1である。
+% \begin{macrocode}
+\newif\ifbxjs at TUenc
+\def\bxjs at tmpa{TU}\edef\bxjs at tmpb{\f at encoding}
+\ifx\bxjs at tmpa\bxjs at tmpb
+ \bxjs at TUenctrue
+\fi
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\bxjs at cond}
% |\bxjs at cond\ifXXX|……|\fi{|\Meta{真}|}{|\Meta{偽}|}|\par
% {\TeX}のif-文（|\ifXXX|……\Meta{真}|\else|\Meta{偽}|\fi|）を
@@ -2478,7 +2497,11 @@
% ムニャムニャムニャ……。
% \end{ZRnote}
% \begin{macrocode}
- \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \ifbxjs at 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 at get@external at font\get at external@font
\def\get at external@font{%
@@ -2514,7 +2537,9 @@
\edef\mandatory at arg{%
\mandatory at arg\expandafter\genb at x\jsc at cref@size..\@@}%
\empty at sfcnt}
- \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \ifbxjs at TUenc\else
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \fi
\fi
% \end{macrocode}
%
@@ -8411,6 +8436,14 @@
\DeclareFontShape{\jsc at JYn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JYn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JYn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{it}{<->ssub*mc/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{sl}{<->ssub*mc/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{sc}{<->ssub*mc/m/n}{}
@@ -8418,6 +8451,14 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
% \end{macrocode}
%
% 欧文総称フォント命令で和文フォントが連動するように修正する。
@@ -9886,6 +9927,40 @@
}\bxjs at next
% \end{macrocode}
%
+% フォント代替の明示的定義。
+% \begin{macrocode}
+\DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{mc}{m}{sl}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{mc}{m}{sc}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{gt}{m}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{mc}{m}{it}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{mc}{m}{sl}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{mc}{m}{sc}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{gt}{m}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
+% \end{macrocode}
+%
% \paragraph{和文フォント定義}
%
% |\jsJaFont| が指定された場合は、その値をオプションと
@@ -10191,10 +10266,17 @@
% \begin{macrocode}
%<*pandoc>
\input{bxjsja-standard.def}
+% \end{macrocode}
+%
+% |bxjspandoc| パッケージを読み込む。
+% \begin{macrocode}
\RequirePackage{bxjspandoc}
% \end{macrocode}
%
-% |etoolbox| の |\AtEndPreamble| のフックを用意する。
+% \begin{macro}{\bxjs at endpreamble@hook}
+% |etoolbox| の |\AtEndPreamble| で実行されるBXJSクラス用のフック。
+% \Note {\eTeX}以外では無効になる。
+% （将来pandocの外に出す可能性あり。）
% \begin{macrocode}
\@onlypreamble\bxjs at endpreamble@hook
\let\bxjs at endpreamble@hook\@empty
@@ -10203,6 +10285,7 @@
\AtEndPreamble{\bxjs at endpreamble@hook}
\fi
% \end{macrocode}
+% \end{macro}
%
%^^A----------------
%\subsection{duploadシステム}
@@ -10224,6 +10307,8 @@
\@onlypreamble\bxjs at set@dupload at proc@a
\def\bxjs at set@dupload at proc@a#1{%
\@onlypreamble#1\def#1##1}
+\def\bxjs at unset@dupload at proc#1{%
+ \expandafter\let\csname bxjs at dlp/#1\endcsname\@undefined}
% \end{macrocode}
% \end{macro}
%
@@ -10232,22 +10317,28 @@
% \begin{macrocode}
\@onlypreamble\bxjs at org@if at ptions
\let\bxjs at org@if at ptions\@if at ptions
-\newif\ifbxjs at dlp
+\@onlypreamble\bxjs at org@reset at ptions
+\let\bxjs at org@reset at ptions\relax
\def\@if at ptions#1#2#3{%
- \bxjs at dlpfalse
+ \let\bxjs at next\@secondoftwo
\def\bxjs at tmpa{#1}\def\bxjs at tmpb{\@currext}%
\ifx\bxjs at tmpa\bxjs at tmpb
\expandafter\ifx\csname bxjs at dlp/#2.#1\endcsname\relax\else
- \bxjs at dlptrue \fi
+ \let\bxjs at next\@firstoftwo \fi
\fi
- \ifbxjs at dlp \expandafter\bxjs at do@dupload at proc
- \else \expandafter\bxjs at org@if at ptions
- \fi {#1}{#2}{#3}}
+ \bxjs at next\bxjs at do@dupload at proc\bxjs at org@if at ptions{#1}{#2}{#3}}
\g at addto@macro\bxjs at begin@document at hook{%
\let\@if at ptions\bxjs at org@if at ptions}
\@onlypreamble\bxjs at do@dupload at proc
\def\bxjs at do@dupload at proc#1#2#3{%
- \csname bxjs at dlp/#2.#1\endcsname{#3}%
+ \ifx\bxjs at org@reset at ptions\relax
+ \let\bxjs at org@reset at ptions\@reset at ptions
+ \fi
+ \bxjs at csletcs{bxjs at next}{bxjs at dlp/#2.#1}%
+ \def\@reset at ptions{%
+ \let\@reset at ptions\bxjs at org@reset at ptions
+ \@reset at ptions
+ \bxjs at next{#3}}%
\@firstoftwo}
% \end{macrocode}
% \end{macro}
@@ -10257,51 +10348,163 @@
% |lang=ja| という言語指定が行われると、
% Pandocはこれに対応していないため
% 不完全なBabelやPolyglossiaの設定を出力してしまう。
-% これを防ぐため、とりあえず両パッケージを無効化しておく。
+% これを防ぐための対策を行う。
%
+% \begin{macro}{\bxjs at lang@pkg at options}
+% Babel・Polyglossiaのオプション列のテキスト。
+% “実際には読み込まれていない”場合は |\relax| になる。
% \begin{macrocode}
-\newif\ifbxjs at lang@exists
+\let\bxjs at lang@pkg at options\relax
+% \end{macrocode}
+% \end{macro}
+%
+% \paragraph{Polyglossiaについて}
+% つまり{\XeTeX}・{Lua\TeX}の場合。
+% \Note この場合 |etoolbox| が使用可能になっている。
+% \begin{macrocode}
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
% \end{macrocode}
-% Polyglossiaについて。
+%
+% パッケージの読込を検知するため読込済のマークを付けて
+% duploadの処理を仕込む。
% \begin{macrocode}
\pandocSkipLoadPackage{polyglossia}
\bxjs at set@dupload at proc{polyglossia.sty}{%
+ \bxjs at unset@dupload at proc{polyglossia.sty}%
\ClassWarning\bxjs at clsname
- {Loading of polyglossia is blocked}%
- \bxjs at lang@existstrue}
-\ifx\setmainlanguage\@undefined
-\newcommand*\setmainlanguage[2][]{}
-\newcommand*\setotherlanguage[2][]{%
- \ifcat_#2_\else
- \expandafter\let\csname #2\endcsname\@empty
- \expandafter\let\csname end#2\endcsname\@empty
- \expandafter\let\csname text#2\endcsname\@firstofone
- \fi}
-\newcommand*\setotherlanguages[2][]{%
- \@for\bxjs at tmpa:={#2}\do{%
- \setotherlangauge{\bxjs at tmpa}}}
-\fi
+ {Package polyglossia is required}%
+ \def\bxjs at lang@pkg at options{#1}%
+% \end{macrocode}
+%
+% |polyglossia| の読込が指示された場合、
+% 直後に |\setmainlanguage| が実行されることを想定して、
+% フック用の |\setmainlanguage| を定義する。
+% \Note 先に |\setmainlanguage| 以外が実行された場合はエラーになる。
+% \begin{macrocode}
+ \newcommand*\setmainlanguage[2][]{%
+% \end{macrocode}
+% もし、言語名が空の |\setmainlanguage{}| が実行された場合は、
+% |lang=ja| が指定されたと見なす。
+% \begin{macrocode}
+ \ifblank{##2}{%
+ \ClassWarning\bxjs at clsname
+ {Main language is invalid, thus the fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs at pandoc@lang at ja
+% \end{macrocode}
+% 言語名が非空ならば、本来の |polyglossia| の処理を実行する。
+% \begin{macrocode}
+ }{%else
+ \ClassWarning\bxjs at clsname
+ {Main language is valid (##2),\MessageBreak
+ thus polyglossia will be loaded}%
+ \csundef{ver at polyglossia.sty}%
+ \edef\bxjs at next{%
+ \noexpand\RequirePackage[\bxjs at lang@pkg at options]{polyglossia}[]%
+ }\bxjs at next
+ \setmainlanguage[##1]{##2}%
+ }}}
+% \end{macrocode}
+%
+% プレアンブルで |polyglossia| の読込が指示されなかった場合、
+% Polyglossiaと連携するパッケージの誤動作を防ぐため、
+% 読込済マークを外す。
+% \begin{macrocode}
\g at addto@macro\bxjs at endpreamble@hook{%
- \ifbxjs at lang@exists\else
+ \ifx\bxjs at lang@pkg at options\relax
\csundef{ver at polyglossia.sty}%
\fi}
+% \end{macrocode}
+%
+% \begin{macro}{\bxjs at pandoc@lang at ja}
+% Pandoc側で |lang=ja| が指定されていた場合の処理。
+% この場合はPolyglossiaの処理を無効化するためにダミーの定義を行う。
+% その時点でダミーの |\setotherlanguage(s)| を定義する。
+% \begin{macrocode}
+\@onlypreamble\bxjs at pandoc@lang at ja
+\def\bxjs at pandoc@lang at ja{%
+ \renewcommand*\setmainlanguage[2][]{}%
+ \newcommand*\setotherlanguage[2][]{%
+ \ifblank{##2}{}{%else
+ \cslet{##2}\@empty \cslet{end##2}\@empty
+ \cslet{text##2}\@firstofone}}%
+ \newcommand*\setotherlanguages[2][]{%
+ \@for\bxjs at tmpa:={##2}\do{%
+ \setotherlangauge{\bxjs at tmpa}}}%
+% \end{macrocode}
+% Polyglossiaの読込済マークは外れるようにしておく。
+% \begin{macrocode}
+ \let\bxjs at lang@pkg at options\relax}%
+% \end{macrocode}
+% \end{macro}
+%
+% \paragraph{Babelについて}
+% {\XeTeX}・{Lua\TeX}以外の場合。
+% \begin{macrocode}
\else
% \end{macrocode}
-% Babelについて。
+%
+% パッケージの読込を検知するため読込済のマークを付けて
+% duploadの処理を仕込む。
% \begin{macrocode}
\pandocSkipLoadPackage{babel}
\bxjs at set@dupload at proc{babel.sty}{%
+ \bxjs at unset@dupload at proc{babel.sty}%
\ClassWarning\bxjs at clsname
- {Loading of babel is blocked}%
- \bxjs at lang@existstrue}
-\let\foreignlanguage\@secondoftwo
-\let\otherlanguage\@gobble
-\let\endotherlanguage\@empty
+ {Package babel is required}%
+% \end{macrocode}
+% パッケージオプションに言語名が空の |main=| があるかを調べる。
+% ある場合は |lang=ja| 対策を実行する。
+% \Note |\bxjs at lang@pkg at options| には |main=| を除いたオプション列を
+% 格納する。
+% \begin{macrocode}
+ \@tempswafalse \let\bxjs at lang@pkg at options\@empty
+ \def\bxjs at tmpb{main=}%
+ \@for\bxjs at tmpa:=#1\do{%
+ \ifx\bxjs at tmpa\bxjs at tmpb \@tempswatrue
+ \else \edef\bxjs at lang@pkg at options{\bxjs at lang@pkg at options,\bxjs at tmpa}%
+ \fi}%
+ \if at tempswa
+ \ClassWarning\bxjs at clsname
+ {Main language is invalid, so fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs at pandoc@lang at ja
+% \end{macrocode}
+% ない場合は、本来の |babel| の処理を実行する。
+% \begin{macrocode}
+ \else
+ \ClassWarning\bxjs at clsname
+ {Main language is valid,\MessageBreak
+ thus babel will be loaded}%
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
+ \RequirePackage[#1]{babel}[]%
+ \fi}
+% \end{macrocode}
+%
+% プレアンブルで |babel| の読込が指示されなかった場合、
+% 読込済マークを外す。
+% \begin{macrocode}
\g at addto@macro\bxjs at endpreamble@hook{%
- \ifbxjs at lang@exists\else
- \csundef{ver at babel.sty}%
+ \ifx\bxjs at lang@pkg at options\relax
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
\fi}
+% \end{macrocode}
+%
+% \begin{macro}{\bxjs at pandoc@lang at ja}
+% Pandoc側で |lang=ja| が指定されていた場合の処理。
+% \begin{macrocode}
+\@onlypreamble\bxjs at pandoc@lang at ja
+\def\bxjs at pandoc@lang at ja{%
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
+ \edef\bxjs at next{%
+ \noexpand\RequirePackage[\bxjs at lang@pkg at options]{babel}[]%
+ }\bxjs at next
+ \RequirePackage[main=japanese]{pxbabel}[]}
+% \end{macrocode}
+% \end{macro}
+%
+% lang対策はこれで終わり。
+% \begin{macrocode}
\fi
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2018-09-04 21:13:16 UTC (rev 48576)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsarticle}
\newif\ifjsc at needsp@tch
@@ -87,6 +87,11 @@
\let\PackageWarningNoLine\bxjs at tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
+\newif\ifbxjs at TUenc
+\def\bxjs at tmpa{TU}\edef\bxjs at tmpb{\f at encoding}
+\ifx\bxjs at tmpa\bxjs at tmpb
+ \bxjs at TUenctrue
+\fi
\@gobbletwo\if\if \def\bxjs at cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -847,7 +852,11 @@
\ifjsc at mag@xreal
\RequirePackage{type1cm}
\let\jsc at invscale\bxjs at invscale
- \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \ifbxjs at 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 at get@external at font\get at external@font
\def\get at external@font{%
@@ -883,7 +892,9 @@
\edef\mandatory at arg{%
\mandatory at arg\expandafter\genb at x\jsc at cref@size..\@@}%
\empty at sfcnt}
- \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \ifbxjs at TUenc\else
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \fi
\fi
\def\jsc at smallskip{\vspace\jsc at smallskipamount}
\newskip\jsc at smallskipamount
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2018-09-04 21:13:16 UTC (rev 48576)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsbook}
\newif\ifjsc at needsp@tch
@@ -87,6 +87,11 @@
\let\PackageWarningNoLine\bxjs at tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
+\newif\ifbxjs at TUenc
+\def\bxjs at tmpa{TU}\edef\bxjs at tmpb{\f at encoding}
+\ifx\bxjs at tmpa\bxjs at tmpb
+ \bxjs at TUenctrue
+\fi
\@gobbletwo\if\if \def\bxjs at cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -856,7 +861,11 @@
\ifjsc at mag@xreal
\RequirePackage{type1cm}
\let\jsc at invscale\bxjs at invscale
- \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \ifbxjs at 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 at get@external at font\get at external@font
\def\get at external@font{%
@@ -892,7 +901,9 @@
\edef\mandatory at arg{%
\mandatory at arg\expandafter\genb at x\jsc at cref@size..\@@}%
\empty at sfcnt}
- \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \ifbxjs at TUenc\else
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \fi
\fi
\def\jsc at smallskip{\vspace\jsc at smallskipamount}
\newskip\jsc at smallskipamount
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscjkcat}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
\def\bxjx at pkgname{bxjscjkcat}
\newcount\bxjx at cnta
\@onlypreamble\bxjx at tmpdo
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscompat}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
\def\bxac at pkgname{bxjscompat}
\let\bxac at engine=n
\def\bxac at do#1#2{%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-minimal.def}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
@@ -172,6 +172,14 @@
\DeclareFontShape{\jsc at JYn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JYn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JYn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JYn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{it}{<->ssub*mc/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{sl}{<->ssub*mc/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{m}{sc}{<->ssub*mc/m/n}{}
@@ -179,6 +187,14 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{\jsc at JTn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-modern.def}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
\input{bxjsja-standard.def}
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
\def\encodingdefault{T1}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\@onlypreamble\bxjs at endpreamble@hook
@@ -36,61 +36,107 @@
\@onlypreamble\bxjs at set@dupload at proc@a
\def\bxjs at set@dupload at proc@a#1{%
\@onlypreamble#1\def#1##1}
+\def\bxjs at unset@dupload at proc#1{%
+ \expandafter\let\csname bxjs at dlp/#1\endcsname\@undefined}
\@onlypreamble\bxjs at org@if at ptions
\let\bxjs at org@if at ptions\@if at ptions
-\newif\ifbxjs at dlp
+\@onlypreamble\bxjs at org@reset at ptions
+\let\bxjs at org@reset at ptions\relax
\def\@if at ptions#1#2#3{%
- \bxjs at dlpfalse
+ \let\bxjs at next\@secondoftwo
\def\bxjs at tmpa{#1}\def\bxjs at tmpb{\@currext}%
\ifx\bxjs at tmpa\bxjs at tmpb
\expandafter\ifx\csname bxjs at dlp/#2.#1\endcsname\relax\else
- \bxjs at dlptrue \fi
+ \let\bxjs at next\@firstoftwo \fi
\fi
- \ifbxjs at dlp \expandafter\bxjs at do@dupload at proc
- \else \expandafter\bxjs at org@if at ptions
- \fi {#1}{#2}{#3}}
+ \bxjs at next\bxjs at do@dupload at proc\bxjs at org@if at ptions{#1}{#2}{#3}}
\g at addto@macro\bxjs at begin@document at hook{%
\let\@if at ptions\bxjs at org@if at ptions}
\@onlypreamble\bxjs at do@dupload at proc
\def\bxjs at do@dupload at proc#1#2#3{%
- \csname bxjs at dlp/#2.#1\endcsname{#3}%
+ \ifx\bxjs at org@reset at ptions\relax
+ \let\bxjs at org@reset at ptions\@reset at ptions
+ \fi
+ \bxjs at csletcs{bxjs at next}{bxjs at dlp/#2.#1}%
+ \def\@reset at ptions{%
+ \let\@reset at ptions\bxjs at org@reset at ptions
+ \@reset at ptions
+ \bxjs at next{#3}}%
\@firstoftwo}
-\newif\ifbxjs at lang@exists
+\let\bxjs at lang@pkg at options\relax
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
\pandocSkipLoadPackage{polyglossia}
\bxjs at set@dupload at proc{polyglossia.sty}{%
+ \bxjs at unset@dupload at proc{polyglossia.sty}%
\ClassWarning\bxjs at clsname
- {Loading of polyglossia is blocked}%
- \bxjs at lang@existstrue}
-\ifx\setmainlanguage\@undefined
-\newcommand*\setmainlanguage[2][]{}
-\newcommand*\setotherlanguage[2][]{%
- \ifcat_#2_\else
- \expandafter\let\csname #2\endcsname\@empty
- \expandafter\let\csname end#2\endcsname\@empty
- \expandafter\let\csname text#2\endcsname\@firstofone
- \fi}
-\newcommand*\setotherlanguages[2][]{%
- \@for\bxjs at tmpa:={#2}\do{%
- \setotherlangauge{\bxjs at tmpa}}}
-\fi
+ {Package polyglossia is required}%
+ \def\bxjs at lang@pkg at options{#1}%
+ \newcommand*\setmainlanguage[2][]{%
+ \ifblank{##2}{%
+ \ClassWarning\bxjs at clsname
+ {Main language is invalid, thus the fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs at pandoc@lang at ja
+ }{%else
+ \ClassWarning\bxjs at clsname
+ {Main language is valid (##2),\MessageBreak
+ thus polyglossia will be loaded}%
+ \csundef{ver at polyglossia.sty}%
+ \edef\bxjs at next{%
+ \noexpand\RequirePackage[\bxjs at lang@pkg at options]{polyglossia}[]%
+ }\bxjs at next
+ \setmainlanguage[##1]{##2}%
+ }}}
\g at addto@macro\bxjs at endpreamble@hook{%
- \ifbxjs at lang@exists\else
+ \ifx\bxjs at lang@pkg at options\relax
\csundef{ver at polyglossia.sty}%
\fi}
+\@onlypreamble\bxjs at pandoc@lang at ja
+\def\bxjs at pandoc@lang at ja{%
+ \renewcommand*\setmainlanguage[2][]{}%
+ \newcommand*\setotherlanguage[2][]{%
+ \ifblank{##2}{}{%else
+ \cslet{##2}\@empty \cslet{end##2}\@empty
+ \cslet{text##2}\@firstofone}}%
+ \newcommand*\setotherlanguages[2][]{%
+ \@for\bxjs at tmpa:={##2}\do{%
+ \setotherlangauge{\bxjs at tmpa}}}%
+ \let\bxjs at lang@pkg at options\relax}%
\else
\pandocSkipLoadPackage{babel}
\bxjs at set@dupload at proc{babel.sty}{%
+ \bxjs at unset@dupload at proc{babel.sty}%
\ClassWarning\bxjs at clsname
- {Loading of babel is blocked}%
- \bxjs at lang@existstrue}
-\let\foreignlanguage\@secondoftwo
-\let\otherlanguage\@gobble
-\let\endotherlanguage\@empty
+ {Package babel is required}%
+ \@tempswafalse \let\bxjs at lang@pkg at options\@empty
+ \def\bxjs at tmpb{main=}%
+ \@for\bxjs at tmpa:=#1\do{%
+ \ifx\bxjs at tmpa\bxjs at tmpb \@tempswatrue
+ \else \edef\bxjs at lang@pkg at options{\bxjs at lang@pkg at options,\bxjs at tmpa}%
+ \fi}%
+ \if at tempswa
+ \ClassWarning\bxjs at clsname
+ {Main language is invalid, so fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs at pandoc@lang at ja
+ \else
+ \ClassWarning\bxjs at clsname
+ {Main language is valid,\MessageBreak
+ thus babel will be loaded}%
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
+ \RequirePackage[#1]{babel}[]%
+ \fi}
\g at addto@macro\bxjs at endpreamble@hook{%
- \ifbxjs at lang@exists\else
- \csundef{ver at babel.sty}%
+ \ifx\bxjs at lang@pkg at options\relax
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
\fi}
+\@onlypreamble\bxjs at pandoc@lang at ja
+\def\bxjs at pandoc@lang at ja{%
+ \expandafter\let\csname ver at babel.sty\endcsname\@undefined
+ \edef\bxjs at next{%
+ \noexpand\RequirePackage[\bxjs at lang@pkg at options]{babel}[]%
+ }\bxjs at next
+ \RequirePackage[main=japanese]{pxbabel}[]}
\fi
\bxjs at set@dupload at proc{geometry.sty}{%
\setpagelayout*{#1}}
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs at simplejasetupfalse
@@ -546,6 +546,36 @@
\edef\bxjs at next{%
\noexpand\RequirePackage[scale=\jsScale]{luatexja-fontspec}[2015/08/26]%
}\bxjs at next
+\DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{mc}{m}{sl}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{mc}{m}{sc}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JY3}{gt}{m}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JY3}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{mc}{m}{it}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{mc}{m}{sl}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{mc}{m}{sc}{<->ssub*mc/m/n}{}
+\DeclareFontShape{JT3}{gt}{m}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{bx}{it}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{gt}{bx}{sl}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT3}{mc}{b}{n}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{mc}{b}{it}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{mc}{b}{sl}{<->ssub*mc/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{n}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{it}{<->ssub*gt/bx/n}{}
+\DeclareFontShape{JT3}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
\bxjs at adjust@jafont{t}
\ifx\bxjs at tmpa\bxjs@@noEmbed
\def\bxjs at tmpa{noembed}
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2018-09-04 21:13:16 UTC (rev 48576)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjspandoc}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjsp at pkgname{bxjscjkcat}
\let\bxjsp at engine=n
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2018-09-04 21:13:16 UTC (rev 48576)
@@ -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 at clsname{bxjsreport}
\newif\ifjsc at needsp@tch
@@ -87,6 +87,11 @@
\let\PackageWarningNoLine\bxjs at tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
+\newif\ifbxjs at TUenc
+\def\bxjs at tmpa{TU}\edef\bxjs at tmpb{\f at encoding}
+\ifx\bxjs at tmpa\bxjs at tmpb
+ \bxjs at TUenctrue
+\fi
\@gobbletwo\if\if \def\bxjs at cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -855,7 +860,11 @@
\ifjsc at mag@xreal
\RequirePackage{type1cm}
\let\jsc at invscale\bxjs at invscale
- \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \ifbxjs at 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 at get@external at font\get at external@font
\def\get at external@font{%
@@ -891,7 +900,9 @@
\edef\mandatory at arg{%
\mandatory at arg\expandafter\genb at x\jsc at cref@size..\@@}%
\empty at sfcnt}
- \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \ifbxjs at TUenc\else
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \fi
\fi
\def\jsc at smallskip{\vspace\jsc at smallskipamount}
\newskip\jsc at smallskipamount
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2018-09-04 21:12:50 UTC (rev 48575)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2018-09-04 21:13:16 UTC (rev 48576)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2018/08/20 v1.9b BXJS document classes]
+ [2018/09/04 v1.9c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsslide}
\newif\ifjsc at needsp@tch
@@ -87,6 +87,11 @@
\let\PackageWarningNoLine\bxjs at tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
+\newif\ifbxjs at TUenc
+\def\bxjs at tmpa{TU}\edef\bxjs at tmpb{\f at encoding}
+\ifx\bxjs at tmpa\bxjs at tmpb
+ \bxjs at TUenctrue
+\fi
\@gobbletwo\if\if \def\bxjs at cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -846,7 +851,11 @@
\ifjsc at mag@xreal
\RequirePackage{type1cm}
\let\jsc at invscale\bxjs at invscale
- \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \ifbxjs at 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 at get@external at font\get at external@font
\def\get at external@font{%
@@ -882,7 +891,9 @@
\edef\mandatory at arg{%
\mandatory at arg\expandafter\genb at x\jsc at cref@size..\@@}%
\empty at sfcnt}
- \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \ifbxjs at TUenc\else
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+ \fi
\fi
\def\jsc at smallskip{\vspace\jsc at smallskipamount}
\newskip\jsc at smallskipamount
More information about the tex-live-commits
mailing list