summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bxjscls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-14 21:15:05 +0000
committerKarl Berry <karl@freefriends.org>2017-06-14 21:15:05 +0000
commitc71ccc0e7d728e6bc090b846fc58559651e3f549 (patch)
treef0c699edd781b516e9d9ae99c600a370c93866cf /Master/texmf-dist/tex/latex/bxjscls
parenta994c5902423e8e50bb47ac78e1a555cad25a06e (diff)
bxjscls (14jun17)
git-svn-id: svn://tug.org/texlive/trunk@44594 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def4
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def113
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls18
10 files changed, 145 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index a7624dd6bca..5d7db80e857 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -86,6 +86,12 @@
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
\fi}
+\def\bxjs@cslet#1{%
+ \expandafter\let\csname#1\endcsname}
+\def\bxjs@csletcs#1#2{%
+ \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
+\def\bxjs@catopt#1#2{%
+ #1\if\relax#1\relax\else\if\relax#2\relax\else,\fi\fi#2}
\def\jsAtEndOfClass{%
\expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
\@onlypreamble\bxjs@restore@jltrcc
@@ -240,7 +246,7 @@
\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
-\define@key{bxjs}{enablejfam}{%
+\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
\let\ifjsDraft\iffalse
@@ -475,7 +481,7 @@
\newif\ifbxjs@fancyhdr \bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@true\bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@false\bxjs@fancyhdrfalse
-\define@key{bxjs}{fancyhdr}{%
+\define@key{bxjs}{fancyhdr}[true]{%
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
@@ -509,15 +515,15 @@
\newif\ifbxjs@whole@zw@lines \bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
-\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
-\define@key{bxjs}{hyperref-enc}{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 6f2b0756d4a..a6b880e9317 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -86,6 +86,12 @@
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
\fi}
+\def\bxjs@cslet#1{%
+ \expandafter\let\csname#1\endcsname}
+\def\bxjs@csletcs#1#2{%
+ \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
+\def\bxjs@catopt#1#2{%
+ #1\if\relax#1\relax\else\if\relax#2\relax\else,\fi\fi#2}
\def\jsAtEndOfClass{%
\expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
\@onlypreamble\bxjs@restore@jltrcc
@@ -246,7 +252,7 @@
\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
-\define@key{bxjs}{enablejfam}{%
+\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
\let\ifjsDraft\iffalse
@@ -481,7 +487,7 @@
\newif\ifbxjs@fancyhdr \bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@true\bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@false\bxjs@fancyhdrfalse
-\define@key{bxjs}{fancyhdr}{%
+\define@key{bxjs}{fancyhdr}[true]{%
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
@@ -518,15 +524,15 @@
\newif\ifbxjs@whole@zw@lines \bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
-\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
-\define@key{bxjs}{hyperref-enc}{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index a0e060d4854..a1d5ede2ce9 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c 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 1e939d70e67..5e0ca3eccc8 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c 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 f54aaf76148..a7e9360acb1 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
@@ -45,6 +45,8 @@
\AtBeginDocument{%
\ifx\familydefault\bxjs@@CSsfdefault#1\fi}%
}
+\@tempdima\p@ \bxjs@invscale\@tempdima\jsScale
+\edef\jsInverseScale{\strip@pt\@tempdima}
\def\jsLetHeadChar#1#2{%
\begingroup
\escapechar=`\\ %
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 1021409e2d9..527a660cbf5 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c 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 fead351d685..ef247e5e273 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c 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 44ec5bc312d..95f40207fcf 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -21,10 +21,24 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
+\newif\ifbxjs@jp@jismmiv
+\bxjs@cslet{bxjs@kv@jis2004@true}\bxjs@jp@jismmivtrue
+\bxjs@cslet{bxjs@kv@jis2004@false}\bxjs@jp@jismmivfalse
+\define@key{bxjsStd}{jis2004}[true]{%
+ \bxjs@set@keyval{jis2004}{#1}{}}
+\let\bxjs@jp@font\@empty
+\define@key{bxjsStd}{font}{%
+ \edef\bxjs@jp@font{#1}}
+\def\bxjs@next#1{\bxjs@safe@setkeys{bxjsStd}{#1}}
+\expandafter\bxjs@next\expandafter{\jsJaParam}
+\ifbxjs@jp@jismmiv
+ \g@addto@macro\@classoptionslist{,jis2004}
+ \PassOptionsToPackage{jis2004}{otf}
+\fi
\ifjsWitheTeX
\@tempdima=0.25mm
\protected\edef\jQ{\dimexpr\the\@tempdima\relax}
@@ -46,6 +60,45 @@
\@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale
\protected\edef\ascpt{\dimexpr\the\@tempdima\relax}
\fi
+\def\jsSetQHLength#1#2{%
+ \begingroup
+ \bxjs@parse@qh{#2}%
+ \ifx\bxjs@tmpb\relax \setlength\@tempdima{#2}%
+ \else \@tempdima\bxjs@tmpb\relax
+ \fi
+ \xdef\bxjs@g@tmpa{\the\@tempdima}%
+ \endgroup
+ #1=\bxjs@g@tmpa\relax}
+\if j\jsEngine
+\def\bxjs@parse@qh#1{%
+ \let\bxjs@tmpb\relax}
+\else
+\def\bxjs@parse@qh#1{%
+ \def\bxjs@tmpa{#1}\let\bxjs@tmpb\relax
+ \bxjs@parse@qh@a{trueQ}\trueQ
+ \bxjs@parse@qh@a{trueH}\trueH
+ \bxjs@parse@qh@a{Q}\jQ
+ \bxjs@parse@qh@a{H}\jH}
+\def\bxjs@parse@qh@a#1#2{%
+ \ifx\bxjs@tmpb\relax
+ \def\bxjs@next##1#1\@nil##2\@nnil{\bxjs@parse@qh@b{##1}{##2}}%
+ \expandafter\bxjs@next\bxjs@tmpa\@nil#1\@nil\@nnil{#2}%
+ \fi}
+\def\bxjs@parse@qh@b#1#2#3{%
+ \ifx\@nnil#2\@nnil\else \def\bxjs@tmpb{#1#3}\fi}
+\fi
+\def\jafontsize#1#2{%
+ \begingroup
+ \bxjs@jafontsize@a{#1}%
+ \@tempdimb\jsInverseScale\@tempdima
+ \bxjs@jafontsize@a{#2}%
+ \xdef\bxjs@g@tmpa{%
+ \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}%
+ \endgroup\bxjs@g@tmpa}
+\def\bxjs@jafontsize@a#1{%
+ \bxjs@parse@qh{#1}%
+ \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi
+ \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil}
\def\bxjs@kanjiskip{0pt}
\newcommand*\setkanjiskip[1]{%
\edef\bxjs@kanjiskip{#1}%
@@ -130,8 +183,13 @@
\loop\if@tempswa
\read\@inputcheck to\bxjs@tmpa
\expandafter\bxjs@get@ke@a\bxjs@tmpa\@nil kanjiEmbed \@nil\@nnil
- \ifx\bxjs@tmpa\relax\else
- \global\let\bxjs@g@tmpa\bxjs@tmpa
+ \ifx\bxjs@tmpb\relax\else
+ \global\let\bxjs@g@tmpa\bxjs@tmpb
+ \@tempswafalse
+ \fi
+ \expandafter\bxjs@get@ke@b\bxjs@tmpa\@nil jaEmbed \@nil\@nnil
+ \ifx\bxjs@tmpb\relax\else
+ \global\let\bxjs@g@tmpa\bxjs@tmpb
\@tempswafalse
\fi
\ifeof\@inputcheck \@tempswafalse \fi
@@ -142,8 +200,13 @@
}
\@onlypreamble\bxjs@get@ke@a
\def\bxjs@get@ke@a#1kanjiEmbed #2\@nil#3\@nnil{%
- \ifx$#1$\def\bxjs@tmpa{#2}%
- \else \let\bxjs@tmpa\relax
+ \ifx$#1$\def\bxjs@tmpb{#2}%
+ \else \let\bxjs@tmpb\relax
+ \fi}
+\@onlypreamble\bxjs@get@ke@b
+\def\bxjs@get@ke@b#1jaEmbed #2\@nil#3\@nnil{%
+ \ifx$#1$\def\bxjs@tmpb{#2}%
+ \else \let\bxjs@tmpb\relax
\fi}
\newcommand*\jachar[1]{%
\begingroup
@@ -227,17 +290,21 @@
\else \def\>{\protect\bxjs@put@xkanjiskip}
\fi
\fi
+\ifbxjs@jp@jismmiv
+ \PassOptionsToPackage{prefer2004jis}{pxchfon}
+ \PassOptionsToPackage{prefer2004jis}{pxbabel}
+\fi
\let\bxjs@tmpa\jsJaFont
\ifx\bxjs@tmpa\bxjs@@auto
\let\bxjs@tmpa\@empty
\else\ifx\bxjs@tmpa\bxjs@@noEmbed
\def\bxjs@tmpa{noembed}
\fi\fi
-\ifx\jsJaFont\@empty\else
- \edef\bxjs@nxt{%
- \noexpand\RequirePackage[\jsJaFont]
- {pxchfon}[2010/05/12]}% v0.5
- \bxjs@nxt
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
+\ifx\bxjs@tmpa\@empty\else
+ \edef\bxjs@next{%
+ \noexpand\RequirePackage[\bxjs@tmpa]{pxchfon}[2010/05/12]% v0.5
+ }\bxjs@next
\fi
\begingroup
\global\let\@gtempa\relax
@@ -304,11 +371,11 @@
\fi
\else\if p\jsEngine
\bxjs@adjust@jafont{f}
-\edef\bxjs@nxt{%
- \noexpand\RequirePackage[%
- \ifx\bxjs@tmpa\@empty\else \bxjs@tmpa,\fi
- whole,autotilde]{bxcjkjatype}[2013/10/15]}% v0.2c
-\bxjs@nxt
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa{whole,autotilde}}
+\edef\bxjs@next{%
+ \noexpand\RequirePackage[\bxjs@tmpa]{bxcjkjatype}[2013/10/15]% v0.2c
+}\bxjs@next
\bxjs@cjk@loaded
\ifbxjs@hyperref@enc
\PassOptionsToPackage{unicode}{hyperref}
@@ -374,14 +441,14 @@
{xeCJK or zxjatype is too old}\@ehc
\fi
\bxjs@adjust@jafont{f}
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
\ifx\bxjs@tmpa\@empty
\setCJKmainfont[BoldFont=IPAexGothic]{IPAexMincho}
\setCJKsansfont[BoldFont=IPAexGothic]{IPAexGothic}
\else
- \edef\bxjs@nxt{%
- \noexpand\RequirePackage[\bxjs@tmpa]%
- {zxjafont}[2013/01/28]}% v0.2a
- \bxjs@nxt
+ \edef\bxjs@next{%
+ \noexpand\RequirePackage[\bxjs@tmpa]{zxjafont}[2013/01/28]}% v0.2a
+ }\bxjs@next
\fi
\ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99992}>\m@ne
\ifbxjs@hyperref@enc
@@ -434,15 +501,15 @@
\ifx\bxjs@tmpa\bxjs@@noEmbed
\def\bxjs@tmpa{noembed}
\fi
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
\ifx\bxjs@tmpa\@empty
\defaultjfontfeatures{ Kerning=Off }
\setmainjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexMincho}
\setsansjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexGothic}
\else
- \edef\bxjs@nxt{%
- \noexpand\RequirePackage[\bxjs@tmpa]
- {luatexja-preset}}%
- \bxjs@nxt
+ \edef\bxjs@next{%
+ \noexpand\RequirePackage[\bxjs@tmpa]{luatexja-preset}%
+ }\bxjs@next
\fi
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index edaf2987ca6..ce95871c02b 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -86,6 +86,12 @@
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
\fi}
+\def\bxjs@cslet#1{%
+ \expandafter\let\csname#1\endcsname}
+\def\bxjs@csletcs#1#2{%
+ \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
+\def\bxjs@catopt#1#2{%
+ #1\if\relax#1\relax\else\if\relax#2\relax\else,\fi\fi#2}
\def\jsAtEndOfClass{%
\expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
\@onlypreamble\bxjs@restore@jltrcc
@@ -246,7 +252,7 @@
\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
-\define@key{bxjs}{enablejfam}{%
+\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
\let\ifjsDraft\iffalse
@@ -481,7 +487,7 @@
\newif\ifbxjs@fancyhdr \bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@true\bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@false\bxjs@fancyhdrfalse
-\define@key{bxjs}{fancyhdr}{%
+\define@key{bxjs}{fancyhdr}[true]{%
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
@@ -518,15 +524,15 @@
\newif\ifbxjs@whole@zw@lines \bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
-\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
-\define@key{bxjs}{hyperref-enc}{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 384f9fe2dde..e5e6541ac2f 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}
- [2017/04/01 v1.5b BXJS document classes]
+ [2017/06/10 v1.5c BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -86,6 +86,12 @@
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
\fi}
+\def\bxjs@cslet#1{%
+ \expandafter\let\csname#1\endcsname}
+\def\bxjs@csletcs#1#2{%
+ \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
+\def\bxjs@catopt#1#2{%
+ #1\if\relax#1\relax\else\if\relax#2\relax\else,\fi\fi#2}
\def\jsAtEndOfClass{%
\expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
\@onlypreamble\bxjs@restore@jltrcc
@@ -240,7 +246,7 @@
\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
-\define@key{bxjs}{enablejfam}{%
+\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
\let\ifjsDraft\iffalse
@@ -475,7 +481,7 @@
\newif\ifbxjs@fancyhdr \bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@true\bxjs@fancyhdrtrue
\let\bxjs@kv@fancyhdr@false\bxjs@fancyhdrfalse
-\define@key{bxjs}{fancyhdr}{%
+\define@key{bxjs}{fancyhdr}[true]{%
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
@@ -509,15 +515,15 @@
\newif\ifbxjs@whole@zw@lines \bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
-\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
-\define@key{bxjs}{hyperref-enc}{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%