bxjscls (20feb16)

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

10 files changed, 844 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 50b036892fe..c7a506a5696 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `article')
+%% bxjscls.dtx  (with options: `cls,article')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -37,9 +37,14 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsarticle}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a BXJS document classes]
+%% このファイルは日本語文字を含みます
 \RequirePackage{calc}
 \RequirePackage{keyval}
+\IfFileExists{bxjscompat.sty}{%
+  \let\jsAtEndOfClass\@gobble
+  \RequirePackage{bxjscompat}%
+}{}
 \let\jsEngine=n
 \def\bxjs@test@engine#1#2{%
   \edef\bxjs@tmpa{\string#1}%
@@ -66,9 +71,10 @@
   \def\bxjs@robust@def{\DeclareRobustCommand*}
 \fi
 \newif\ifjsInPdfMode
-\ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@
-  \jsInPdfModetrue
-\fi\fi
+\@nameuse{ImposeOldLuaTeXBehavior}
+\RequirePackage{ifpdf}
+\@nameuse{RevokeOldLuaTeXBehavior}
+\let\ifjsInPdfMode\ifpdf
 \@gobbletwo\if\if \def\bxjs@cond#1\fi{%
   #1\expandafter\@firstoftwo
   \else\expandafter\@secondoftwo
@@ -79,6 +85,8 @@
 \let\jsSlide=s
 \let\jsDocClass\jsArticle
 \def\bxjs@clsname{bxjsarticle}
+\def\jsAtEndOfClass{%
+  \expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
 \@onlypreamble\bxjs@restore@jltrcc
 \let\bxjs@restore@jltrcc\@empty
 \if l\jsEngine
@@ -248,6 +256,12 @@
       \else \@tempdimb=\@tempcntb\@ne \fi}%
     \xdef\bxjs@gtmpa{\the\@tempdimb}%
   \egroup #1=\bxjs@gtmpa\relax}
+\let\bxjs@composite@proc\relax
+\DeclareOption{pandoc}{%
+  \def\bxjs@composite@proc{%
+    \setkeys{bxjs}{ja=pandoc}%
+    \let\bxjs@engine@given=*}%
+  \def\bxjs@driver@opt{dvipdfmx-if-dvi}}
 \DeclareOption{autodetect-engine}{%
   \let\bxjs@engine@given=*}
 \DeclareOption{latex}{%
@@ -342,7 +356,8 @@
 \define@key{bxjs}{paper}{\edef\bxjs@param@paper{#1}}
 \let\bxjs@jadriver\relax
 \define@key{bxjs}{jadriver}{\edef\bxjs@jadriver{#1}}
-\define@key{bxjs}{ja}{\edef\bxjs@jadriver{#1}}
+\define@key{bxjs}{ja}[\relax]{%
+  \ifx\relax#1\else\edef\bxjs@jadriver{#1}\fi}
 \let\jsJaFont\@empty
 \define@key{bxjs}{jafont}{\edef\jsJaFont{#1}}
 \let\jsJaParam\@empty
@@ -367,6 +382,7 @@
   \fi}
 \ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
 \ProcessOptions\relax
+\bxjs@composite@proc
 \@onlypreamble\bxjs@purge@brace@elts
 \def\bxjs@purge@brace@elts{%
   \def\bxjs@tmpa{\@gobble}%
@@ -401,6 +417,11 @@
 \fi\fi
 \ifx *\bxjs@engine@given
   \let\bxjs@engine@given\bxjs@tmpb
+  \ifx j\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,platex}
+  \else\ifx u\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,uplatex}
+  \fi\fi
 \fi
 \ifx\bxjs@engine@given\@undefined\else
   \ifx\bxjs@engine@given\bxjs@tmpb\else
@@ -769,7 +790,9 @@
 \fi
 \edef\bxjs@nxt{%
   \noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}}
+\AtBeginDocument{\ImposeOldLuaTeXBehavior}
 \bxjs@nxt \bxjs@revert
+\AtBeginDocument{\RevokeOldLuaTeXBehavior}
 \bxjs@postproc@layout
 \def\setpagelayout{\@ifstar
   {\bxjs@reset@layout}{\bxjs@modify@layout}}
@@ -860,6 +883,7 @@
   \let\sectionmark\@gobble
   \let\subsectionmark\@gobble
 }
+\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}}
 \def\plainifnotempty{%
   \ifx \@oddhead \@empty
     \ifx \@oddfoot \@empty
@@ -884,6 +908,10 @@
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \smallskip
           \@title
+          \ifx\bxjs@subtitle\@undefined\else
+            \par\vskip\z@
+            {\small \bxjs@subtitle\par}
+          \fi
           \smallskip
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \vfill
@@ -893,6 +921,10 @@
       \vskip 60\p@?
       \begin{center}%
         {\LARGE \@title \par}%
+        \ifx\bxjs@subtitle\@undefined\else
+          \vskip5\p@?
+          {\normalsize \bxjs@subtitle\par}
+        \fi
         \vskip 3em%
         {\large
           \lineskip .75em
@@ -958,6 +990,10 @@
     \begin{center}%
       \let\footnote\thanks
       {\LARGE \@title \par}%
+      \ifx\bxjs@subtitle\@undefined\else
+        \vskip3\p@?
+        {\normalsize \bxjs@subtitle\par}
+      \fi
       \vskip 1.5em
       {\large
         \lineskip .5em
@@ -1158,6 +1194,7 @@
     {\normalfont\normalsize\headfont}}
 \fi
 \newcommand\jsParagraphMark{\jsJaChar{■}}
+\let\jsJaChar\@empty
 \if@twocolumn
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {\z@}{-1\jsZw}% 改行せず 1\jsZw のアキ
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 47ce8753aba..197e99e6fee 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `book')
+%% bxjscls.dtx  (with options: `cls,book')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -37,9 +37,14 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsbook}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a BXJS document classes]
+%% このファイルは日本語文字を含みます
 \RequirePackage{calc}
 \RequirePackage{keyval}
+\IfFileExists{bxjscompat.sty}{%
+  \let\jsAtEndOfClass\@gobble
+  \RequirePackage{bxjscompat}%
+}{}
 \let\jsEngine=n
 \def\bxjs@test@engine#1#2{%
   \edef\bxjs@tmpa{\string#1}%
@@ -66,9 +71,10 @@
   \def\bxjs@robust@def{\DeclareRobustCommand*}
 \fi
 \newif\ifjsInPdfMode
-\ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@
-  \jsInPdfModetrue
-\fi\fi
+\@nameuse{ImposeOldLuaTeXBehavior}
+\RequirePackage{ifpdf}
+\@nameuse{RevokeOldLuaTeXBehavior}
+\let\ifjsInPdfMode\ifpdf
 \@gobbletwo\if\if \def\bxjs@cond#1\fi{%
   #1\expandafter\@firstoftwo
   \else\expandafter\@secondoftwo
@@ -79,6 +85,8 @@
 \let\jsSlide=s
 \let\jsDocClass\jsBook
 \def\bxjs@clsname{bxjsbook}
+\def\jsAtEndOfClass{%
+  \expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
 \@onlypreamble\bxjs@restore@jltrcc
 \let\bxjs@restore@jltrcc\@empty
 \if l\jsEngine
@@ -252,6 +260,12 @@
       \else \@tempdimb=\@tempcntb\@ne \fi}%
     \xdef\bxjs@gtmpa{\the\@tempdimb}%
   \egroup #1=\bxjs@gtmpa\relax}
+\let\bxjs@composite@proc\relax
+\DeclareOption{pandoc}{%
+  \def\bxjs@composite@proc{%
+    \setkeys{bxjs}{ja=pandoc}%
+    \let\bxjs@engine@given=*}%
+  \def\bxjs@driver@opt{dvipdfmx-if-dvi}}
 \DeclareOption{autodetect-engine}{%
   \let\bxjs@engine@given=*}
 \DeclareOption{latex}{%
@@ -346,7 +360,8 @@
 \define@key{bxjs}{paper}{\edef\bxjs@param@paper{#1}}
 \let\bxjs@jadriver\relax
 \define@key{bxjs}{jadriver}{\edef\bxjs@jadriver{#1}}
-\define@key{bxjs}{ja}{\edef\bxjs@jadriver{#1}}
+\define@key{bxjs}{ja}[\relax]{%
+  \ifx\relax#1\else\edef\bxjs@jadriver{#1}\fi}
 \let\jsJaFont\@empty
 \define@key{bxjs}{jafont}{\edef\jsJaFont{#1}}
 \let\jsJaParam\@empty
@@ -371,6 +386,7 @@
   \fi}
 \ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
 \ProcessOptions\relax
+\bxjs@composite@proc
 \@onlypreamble\bxjs@purge@brace@elts
 \def\bxjs@purge@brace@elts{%
   \def\bxjs@tmpa{\@gobble}%
@@ -405,6 +421,11 @@
 \fi\fi
 \ifx *\bxjs@engine@given
   \let\bxjs@engine@given\bxjs@tmpb
+  \ifx j\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,platex}
+  \else\ifx u\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,uplatex}
+  \fi\fi
 \fi
 \ifx\bxjs@engine@given\@undefined\else
   \ifx\bxjs@engine@given\bxjs@tmpb\else
@@ -777,7 +798,9 @@
 \fi
 \edef\bxjs@nxt{%
   \noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}}
+\AtBeginDocument{\ImposeOldLuaTeXBehavior}
 \bxjs@nxt \bxjs@revert
+\AtBeginDocument{\RevokeOldLuaTeXBehavior}
 \bxjs@postproc@layout
 \def\setpagelayout{\@ifstar
   {\bxjs@reset@layout}{\bxjs@modify@layout}}
@@ -863,6 +886,7 @@
   \let\chaptermark\@gobble
   \let\sectionmark\@gobble
 }
+\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}}
 \def\plainifnotempty{%
   \ifx \@oddhead \@empty
     \ifx \@oddfoot \@empty
@@ -887,6 +911,10 @@
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \smallskip
           \@title
+          \ifx\bxjs@subtitle\@undefined\else
+            \par\vskip\z@
+            {\small \bxjs@subtitle\par}
+          \fi
           \smallskip
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \vfill
@@ -896,6 +924,10 @@
       \vskip 60\p@?
       \begin{center}%
         {\LARGE \@title \par}%
+        \ifx\bxjs@subtitle\@undefined\else
+          \vskip5\p@?
+          {\normalsize \bxjs@subtitle\par}
+        \fi
         \vskip 3em%
         {\large
           \lineskip .75em
@@ -961,6 +993,10 @@
     \begin{center}%
       \let\footnote\thanks
       {\LARGE \@title \par}%
+      \ifx\bxjs@subtitle\@undefined\else
+        \vskip3\p@?
+        {\normalsize \bxjs@subtitle\par}
+      \fi
       \vskip 1.5em
       {\large
         \lineskip .5em
@@ -1251,6 +1287,7 @@
     {\normalfont\normalsize\headfont}}
 \fi
 \newcommand\jsParagraphMark{\jsJaChar{■}}
+\let\jsJaChar\@empty
 \if@twocolumn
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {\z@}{-1\jsZw}% 改行せず 1\jsZw のアキ
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
new file mode 100644
index 00000000000..bbbbdfc70f3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -0,0 +1,347 @@
+%%
+%% This is file `bxjscjkcat.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bxjscls.dtx  (with options: `anc,cjkcat')
+%% 
+%% IMPORTANT NOTICE:
+%% 
+%% For the copyright see the source file.
+%% 
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from bxjscjkcat.sty.
+%% 
+%% For distribution of the original source see the terms
+%% for copying and modification in the file bxjscls.dtx.
+%% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesPackage{bxjscjkcat}
+  [2016/02/20 v1.1a BXJS document classes]
+\def\bxjx@pkgname{bxjscjkcat}
+\newcount\bxjx@cnta
+\let\bxjx@engine=n
+\def\bxjx@do#1#2{%
+  \edef\bxjx@tmpa{\string#1}%
+  \edef\bxjx@tmpb{\meaning#1}%
+  \ifx\bxjx@tmpa\bxjx@tmpb #2\fi}
+\bxjx@do\kanjiskip{\let\bxjx@engine=j}
+\bxjx@do\enablecjktoken{\let\bxjx@engine=u}
+\bxjx@do\XeTeXversion{\let\bxjx@engine=x}
+\bxjx@do\pdftexversion{\let\bxjx@engine=p}
+\bxjx@do\luatexversion{\let\bxjx@engine=l}
+\def\bxjx@do#1#2{%
+  \if#1\bxjx@engine
+    \@ifpackageloaded{#2}{}{%else
+      \PackageError\bxjx@pkgname
+       {Package '#2' must be loaded}%
+       {Package loading is aborted.\MessageBreak\@ehc}%
+      \endinput}
+  \fi}
+\bxjx@do{p}{bxcjkjatype}
+\bxjx@do{x}{xeCJK}
+\bxjx@do{l}{luatexja}
+\ifx\TextOrMath\@undefined
+  \RequirePackage{fixltx2e}
+\fi
+\if u\bxjx@engine
+\@for\bxjx@x:={%
+0080,0100,0180,0250,02B0,0300,0500,0530,0590,0600,%
+0700,0750,0780,07C0,0800,0840,08A0,0900,0980,0A00,%
+0A80,0B00,0B80,0C00,0C80,0D00,0D80,0E00,0E80,0F00,%
+1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,%
+1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,%
+1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1CC0,1CD0,1D00,%
+1D80,1DC0,1E00,2440,27C0,27F0,2800,2A00,2C00,2C60,%
+2C80,2D00,2D30,2D80,2DE0,2E00,4DC0,A4D0,A500,A640,%
+A6A0,A700,A720,A800,A830,A840,A880,A8E0,A900,A930,%
+A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,%
+D800,DB80,DC00,E000,FB00,FB50,FE00,FE70,%
+10000,10080,10100,10140,10190,101D0,10280,102A0,%
+102E0,10300,10330,10350,10380,103A0,10400,10450,%
+10480,10500,10530,10600,10800,10840,10860,10880,%
+108E0,10900,10920,10980,109A0,10A00,10A60,10A80,%
+10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,%
+11000,11080,110D0,11100,11150,11180,111E0,11200,%
+11280,112B0,11300,11480,11580,11600,11680,11700,%
+118A0,11AC0,12000,12400,12480,13000,14400,16800,%
+16A40,16AD0,16B00,16F00,1BC00,1BCA0,1D000,1D100,%
+1D200,1D300,1D360,1D400,1D800,1E800,1EE00,1F000,%
+1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,%
+1F700,1F780,1F800,1F900,E0000,F0000,100000%
+}\do{\kcatcode"\bxjx@x=15 }
+\fi
+\def\bxjx@grkcyr@list{%
+\do{0391}{LGR}{\textAlpha}{A}%            % GR. C. L. ALPHA
+\do{0392}{LGR}{\textBeta}{B}%             % GR. C. L. BETA
+\do{0393}{LGR}{\textGamma}{\Gamma}%       % GR. C. L. GAMMA
+\do{0394}{LGR}{\textDelta}{\Delta}%       % GR. C. L. DELTA
+\do{0395}{LGR}{\textEpsilon}{E}%          % GR. C. L. EPSILON
+\do{0396}{LGR}{\textZeta}{Z}%             % GR. C. L. ZETA
+\do{0397}{LGR}{\textEta}{H}%              % GR. C. L. ETA
+\do{0398}{LGR}{\textTheta}{\Theta}%       % GR. C. L. THETA
+\do{0399}{LGR}{\textIota}{I}%             % GR. C. L. IOTA
+\do{039A}{LGR}{\textKappa}{K}%            % GR. C. L. KAPPA
+\do{039B}{LGR}{\textLambda}{\Lambda}%     % GR. C. L. LAMDA
+\do{039C}{LGR}{\textMu}{M}%               % GR. C. L. MU
+\do{039D}{LGR}{\textNu}{N}%               % GR. C. L. NU
+\do{039E}{LGR}{\textXi}{\Xi}%             % GR. C. L. XI
+\do{039F}{LGR}{\textOmicron}{O}%          % GR. C. L. OMICRON
+\do{03A0}{LGR}{\textPi}{\Pi}%             % GR. C. L. PI
+\do{03A1}{LGR}{\textRho}{P}%              % GR. C. L. RHO
+\do{03A3}{LGR}{\textSigma}{\Sigma}%       % GR. C. L. SIGMA
+\do{03A4}{LGR}{\textTau}{T}%              % GR. C. L. TAU
+\do{03A5}{LGR}{\textUpsilon}{\Upsilon}%   % GR. C. L. UPSILON
+\do{03A6}{LGR}{\textPhi}{\Phi}%           % GR. C. L. PHI
+\do{03A7}{LGR}{\textChi}{X}%              % GR. C. L. CHI
+\do{03A8}{LGR}{\textPsi}{\Psi}%           % GR. C. L. PSI
+\do{03A9}{LGR}{\textOmega}{\Omega}%       % GR. C. L. OMEGA
+\do{03B1}{LGR}{\textalpha}{\alpha}%       % GR. S. L. ALPHA
+\do{03B2}{LGR}{\textbeta}{\beta}%         % GR. S. L. BETA
+\do{03B3}{LGR}{\textgamma}{\gamma}%       % GR. S. L. GAMMA
+\do{03B4}{LGR}{\textdelta}{\delta}%       % GR. S. L. DELTA
+\do{03B5}{LGR}{\textepsilon}{\epsilon}%   % GR. S. L. EPSILON
+\do{03B6}{LGR}{\textzeta}{\zeta}%         % GR. S. L. ZETA
+\do{03B7}{LGR}{\texteta}{\eta}%           % GR. S. L. ETA
+\do{03B8}{LGR}{\texttheta}{\theta}%       % GR. S. L. THETA
+\do{03B9}{LGR}{\textiota}{\iota}%         % GR. S. L. IOTA
+\do{03BA}{LGR}{\textkappa}{\kappa}%       % GR. S. L. KAPPA
+\do{03BB}{LGR}{\textlambda}{\lambda}%     % GR. S. L. LAMDA
+\do{03BC}{LGR}{\textmu}{\mu}%             % GR. S. L. MU
+\do{03BD}{LGR}{\textnu}{\nu}%             % GR. S. L. NU
+\do{03BE}{LGR}{\textxi}{\xi}%             % GR. S. L. XI
+\do{03BF}{LGR}{\textomicron}{o}%          % GR. S. L. OMICRON
+\do{03C0}{LGR}{\textpi}{\pi}%             % GR. S. L. PI
+\do{03C1}{LGR}{\textrho}{\rho}%           % GR. S. L. RHO
+\do{03C2}{LGR}{\textvarsigma}{\varsigma}% % GR. S. L. FINAL SIGMA
+\do{03C3}{LGR}{\textsigma}{\sigma}%       % GR. S. L. SIGMA
+\do{03C4}{LGR}{\texttau}{\tau}%           % GR. S. L. TAU
+\do{03C5}{LGR}{\textupsilon}{\upsilon}%   % GR. S. L. UPSILON
+\do{03C6}{LGR}{\textphi}{\phi}%           % GR. S. L. PHI
+\do{03C7}{LGR}{\textchi}{\chi}%           % GR. S. L. CHI
+\do{03C8}{LGR}{\textpsi}{\psi}%           % GR. S. L. PSI
+\do{03C9}{LGR}{\textomega}{\omega}%       % GR. S. L. OMEGA
+\do{0401}{T2A}{\CYRYO}{}%                 % CY. C. L. IO
+\do{0410}{T2A}{\CYRA}{}%                  % CY. C. L. A
+\do{0411}{T2A}{\CYRB}{}%                  % CY. C. L. BE
+\do{0412}{T2A}{\CYRV}{}%                  % CY. C. L. VE
+\do{0413}{T2A}{\CYRG}{}%                  % CY. C. L. GHE
+\do{0414}{T2A}{\CYRD}{}%                  % CY. C. L. DE
+\do{0415}{T2A}{\CYRE}{}%                  % CY. C. L. IE
+\do{0416}{T2A}{\CYRZH}{}%                 % CY. C. L. ZHE
+\do{0417}{T2A}{\CYRZ}{}%                  % CY. C. L. ZE
+\do{0418}{T2A}{\CYRI}{}%                  % CY. C. L. I
+\do{0419}{T2A}{\CYRISHRT}{}%              % CY. C. L. SHORT I
+\do{041A}{T2A}{\CYRK}{}%                  % CY. C. L. KA
+\do{041B}{T2A}{\CYRL}{}%                  % CY. C. L. EL
+\do{041C}{T2A}{\CYRM}{}%                  % CY. C. L. EM
+\do{041D}{T2A}{\CYRN}{}%                  % CY. C. L. EN
+\do{041E}{T2A}{\CYRO}{}%                  % CY. C. L. O
+\do{041F}{T2A}{\CYRP}{}%                  % CY. C. L. PE
+\do{0420}{T2A}{\CYRR}{}%                  % CY. C. L. ER
+\do{0421}{T2A}{\CYRS}{}%                  % CY. C. L. ES
+\do{0422}{T2A}{\CYRT}{}%                  % CY. C. L. TE
+\do{0423}{T2A}{\CYRU}{}%                  % CY. C. L. U
+\do{0424}{T2A}{\CYRF}{}%                  % CY. C. L. EF
+\do{0425}{T2A}{\CYRH}{}%                  % CY. C. L. HA
+\do{0426}{T2A}{\CYRC}{}%                  % CY. C. L. TSE
+\do{0427}{T2A}{\CYRCH}{}%                 % CY. C. L. CHE
+\do{0428}{T2A}{\CYRSH}{}%                 % CY. C. L. SHA
+\do{0429}{T2A}{\CYRSHCH}{}%               % CY. C. L. SHCHA
+\do{042A}{T2A}{\CYRHRDSN}{}%              % CY. C. L. HARD SIGN
+\do{042B}{T2A}{\CYRERY}{}%                % CY. C. L. YERU
+\do{042C}{T2A}{\CYRSFTSN}{}%              % CY. C. L. SOFT SIGN
+\do{042D}{T2A}{\CYREREV}{}%               % CY. C. L. E
+\do{042E}{T2A}{\CYRYU}{}%                 % CY. C. L. YU
+\do{042F}{T2A}{\CYRYA}{}%                 % CY. C. L. YA
+\do{0430}{T2A}{\cyra}{}%                  % CY. S. L. A
+\do{0431}{T2A}{\cyrb}{}%                  % CY. S. L. BE
+\do{0432}{T2A}{\cyrv}{}%                  % CY. S. L. VE
+\do{0433}{T2A}{\cyrg}{}%                  % CY. S. L. GHE
+\do{0434}{T2A}{\cyrd}{}%                  % CY. S. L. DE
+\do{0435}{T2A}{\cyre}{}%                  % CY. S. L. IE
+\do{0436}{T2A}{\cyrzh}{}%                 % CY. S. L. ZHE
+\do{0437}{T2A}{\cyrz}{}%                  % CY. S. L. ZE
+\do{0438}{T2A}{\cyri}{}%                  % CY. S. L. I
+\do{0439}{T2A}{\cyrishrt}{}%              % CY. S. L. SHORT I
+\do{043A}{T2A}{\cyrk}{}%                  % CY. S. L. KA
+\do{043B}{T2A}{\cyrl}{}%                  % CY. S. L. EL
+\do{043C}{T2A}{\cyrm}{}%                  % CY. S. L. EM
+\do{043D}{T2A}{\cyrn}{}%                  % CY. S. L. EN
+\do{043E}{T2A}{\cyro}{}%                  % CY. S. L. O
+\do{043F}{T2A}{\cyrp}{}%                  % CY. S. L. PE
+\do{0440}{T2A}{\cyrr}{}%                  % CY. S. L. ER
+\do{0441}{T2A}{\cyrs}{}%                  % CY. S. L. ES
+\do{0442}{T2A}{\cyrt}{}%                  % CY. S. L. TE
+\do{0443}{T2A}{\cyru}{}%                  % CY. S. L. U
+\do{0444}{T2A}{\cyrf}{}%                  % CY. S. L. EF
+\do{0445}{T2A}{\cyrh}{}%                  % CY. S. L. HA
+\do{0446}{T2A}{\cyrc}{}%                  % CY. S. L. TSE
+\do{0447}{T2A}{\cyrch}{}%                 % CY. S. L. CHE
+\do{0448}{T2A}{\cyrsh}{}%                 % CY. S. L. SHA
+\do{0449}{T2A}{\cyrshch}{}%               % CY. S. L. SHCHA
+\do{044A}{T2A}{\cyrhrdsn}{}%              % CY. S. L. HARD SIGN
+\do{044B}{T2A}{\cyrery}{}%                % CY. S. L. YERU
+\do{044C}{T2A}{\cyrsftsn}{}%              % CY. S. L. SOFT SIGN
+\do{044D}{T2A}{\cyrerev}{}%               % CY. S. L. E
+\do{044E}{T2A}{\cyryu}{}%                 % CY. S. L. YU
+\do{044F}{T2A}{\cyrya}{}%                 % CY. S. L. YA
+\do{0451}{T2A}{\cyryo}{}%                 % CY. S. L. IO
+\do{00A7}{TS1}{\textsection}{\mathsection}% SECTION SYMBOL
+\do{00A8}{TS1}{\textasciidieresis}{}%      % DIAERESIS
+\do{00B0}{TS1}{\textdegree}{\mathdegree}% % DEGREE SIGN
+\do{00B1}{TS1}{\textpm}{\pm}%             % PLUS-MINUS SIGN
+\do{00B4}{TS1}{\textasciiacute}{}%        % ACUTE ACCENT
+\do{00B6}{TS1}{\textparagraph}{\mathparagraph}% PILCROW SIGN
+\do{00D7}{TS1}{\texttimes}{\times}%       % MULTIPLICATION SIGN
+\do{00F7}{TS1}{\textdiv}{\div}%           % DIVISION SIGN
+}
+\providecommand*{\mathdegree}{{}^{\circ}}
+\newif\ifbxjx@gcc@cjk
+\newcommand*\greekasCJK{%
+  \bxjx@gcc@cjktrue}
+\newcommand*\nogreekasCJK{%
+  \bxjx@gcc@cjkfalse}
+\def\bxjx@do#1\relax{%
+  \def\bxjx@fake@grk##1##2{%
+    \expandafter\bxjx@fake@grk@a\meaning##2#1\@nil{##1}{##2}}%
+  \def\bxjx@fake@grk@a##1#1##2\@nil##3##4{%
+    \ifx\\##1\\%
+      \bxjx@cnta##4\divide\bxjx@cnta\@cclvi
+      \multiply\bxjx@cnta\@cclvi \advance\bxjx@cnta`##3\relax
+      \mathchar\bxjx@cnta
+    \else ##3\fi}
+}\expandafter\bxjx@do\string\mathchar\relax
+\ifnum0\if p\bxjx@engine1\fi\if u\bxjx@engine1\fi>0
+\@ifpackageloaded{inputenc}{}{%else
+  \RequirePackage[utf8]{inputenc}}
+\def\bxjx@tmpa{utf8}
+\ifx\bxjx@tmpa\inputencdoingname
+  \PackageWarningNoLine\bxjx@pkgname
+   {Input encoding changed to utf8}%
+  \inputencoding{utf8}%
+\fi
+\if u\bxjx@engine
+\kcatcode"0370=15
+\kcatcode"0400=15
+\kcatcode"0500=15
+\fi
+\def\do#1{%
+  \@tempcnta="#1\relax
+  \@tempcntb=\@tempcnta \divide\@tempcntb256
+  \expandafter\let\csname bxjx@KCR/\the\@tempcntb\endcsname=t%
+  \expandafter\bxjx@do@a\csname bxjx@KC/\the\@tempcnta\endcsname{#1}}
+\def\bxjx@do@a#1#2#3#4#5{%
+  \ifx\\#5\\%
+    \def\bxjx@tmpa{\@inmathwarn#4}%
+  \else\ifcat A\noexpand#5%
+    \edef\bxjx@tmpa{\noexpand\bxjx@fake@grk{#5}%
+      {\ifnum\uccode`#5=`#5\noexpand\Pi\else\noexpand\pi\fi}}%
+  \else \def\bxjx@tmpa{#5}%
+  \fi\fi
+  \def\bxjx@tmpb{\bxjx@do@b{#1}{#2}{#3}{#4}}%
+  \expandafter\bxjx@tmpb\expandafter{\bxjx@tmpa}}
+\if u\bxjx@engine
+\def\bxjx@do@b#1#2#3#4#5{%
+  \kchardef#1=\@tempcnta
+  \DeclareTextCommandDefault{#4}{\bxjx@ja@or@not{#1}{#3}{#4}}%
+  \DeclareUnicodeCharacter{#2}{\TextOrMath{#4}{#5}}}
+\else\if p\bxjx@engine
+\def\bxjx@do@b#1#2#3#4#5{%
+  \mathchardef#1=\@tempcnta
+  \DeclareTextCommandDefault{#4}{\bxjx@ja@or@not{\UTF{#2}}{#3}{#4}}%
+  \DeclareUnicodeCharacter{#2}{\TextOrMath{#4}{#5}}}
+\fi\fi
+\bxjx@grkcyr@list
+\let\bxjx@do@a\undefined
+\let\bxjx@do@b\undefined
+\@onlypreamble\bxjx@org@DeclareUnicodeCharacter
+\let\bxjx@org@DeclareUnicodeCharacter\DeclareUnicodeCharacter
+\@onlypreamble\bxjx@DeclareUnicodeCharacter
+\def\bxjx@DeclareUnicodeCharacter#1#2{%
+  \count@="#1\relax \bxjx@cnta\count@ \divide\bxjx@cnta256
+  \expandafter\ifx\csname bxjx@KCR/\the\bxjx@cnta\endcsname\relax
+    \bxjx@org@DeclareUnicodeCharacter{#1}{#2}%
+  \else\expandafter\ifx\csname bxjx@KC/\the\count@\endcsname\relax
+    \bxjx@org@DeclareUnicodeCharacter{#1}{#2}%
+  \else
+    \wlog{ \space\space skipped defining Unicode char U+#1}%
+  \fi\fi}
+\def\bxjx@ja@or@not#1#2#3{%
+  \ifbxjx@gcc@cjk #1%
+  \else\expandafter\ifx\csname T@#2\endcsname\relax #1%
+  \else \UseTextSymbol{#2}{#3}%
+  \fi\fi}
+\begingroup
+\toks@\expandafter{\DeclareFontEncoding@{#1}{#2}{#3}}
+\xdef\next{\def\noexpand\DeclareFontEncoding@##1##2##3{%
+  \noexpand\bxjx@swap@DUC@cmd
+  \the\toks@
+  \noexpand\bxjx@swap@DUC@cmd}}
+\endgroup\next
+\def\bxjx@swap@DUC@cmd{%
+  \let\bxjx@tmpa\DeclareUnicodeCharacter
+  \let\DeclareUnicodeCharacter\bxjx@DeclareUnicodeCharacter
+  \let\bxjx@DeclareUnicodeCharacter\bxjx@tmpa}
+\else\ifnum0\if x\bxjx@engine1\fi\if l\bxjx@engine1\fi>0
+\def\do#1{%
+  \bxjx@cnta="#1\relax
+  \begingroup
+    \lccode`~=\bxjx@cnta
+  \lowercase{\endgroup
+    \bxjx@do@a{~}}{#1}}
+\def\bxjx@do@a#1#2#3#4#5{%
+  \ifx\\#5\\\let\bxjx@tmpa\relax
+  \else\ifcat A\noexpand#5%
+    \edef\bxjx@tmpa{\noexpand\bxjx@fake@grk{#5}%
+      {\ifnum\uccode`#5=`#5\noexpand\Pi\else\noexpand\pi\fi}}%
+  \else \def\bxjx@tmpa{#5}%
+  \fi\fi
+  \ifx\bxjx@tmpa\relax\else
+    \mathcode\bxjx@cnta"8000 \let#1\bxjx@tmpa
+  \fi}
+\mathchardef\bxjx@tmpa="119
+\ifx\bxjx@tmpa\pi \bxjx@grkcyr@list \fi
+\let\bxjx@do@a\undefined
+\if l\bxjx@engine
+  \protected\def\greekasCJK{%
+    \bxjx@gcc@cjktrue
+    \ltjsetparameter{jacharrange={+2, +8}}}
+  \protected\def\nogreekasCJK{%
+    \bxjx@gcc@cjkfalse
+    \ltjsetparameter{jacharrange={-2, -8}}}
+\fi
+\if x\bxjx@engine
+  \protected\def\greekasCJK{%
+    \bxjx@gcc@cjktrue
+    \def\do##1##2##3##4{\XeTeXcharclass"##1\@ne}%
+    \bxjx@grkcyr@list}
+  \protected\def\nogreekasCJK{%
+    \bxjx@gcc@cjkfalse
+    \def\do##1##2##3##4{\XeTeXcharclass"##1\z@}%
+    \bxjx@grkcyr@list}
+\fi
+\fi\fi
+\nogreekasCJK
+\endinput
+%%
+%% End of file `bxjscjkcat.sty'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
new file mode 100644
index 00000000000..6673a7f9961
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -0,0 +1,140 @@
+%%
+%% This is file `bxjscompat.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bxjscls.dtx  (with options: `anc,compat')
+%% 
+%% IMPORTANT NOTICE:
+%% 
+%% For the copyright see the source file.
+%% 
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from bxjscompat.sty.
+%% 
+%% For distribution of the original source see the terms
+%% for copying and modification in the file bxjscls.dtx.
+%% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesPackage{bxjscompat}
+  [2016/02/20 v1.1a BXJS document classes]
+\def\bxac@pkgname{bxjscompat}
+\let\bxac@engine=n
+\def\bxac@do#1#2{%
+  \edef\bxac@tmpa{\string#1}%
+  \edef\bxac@tmpb{\meaning#1}%
+  \ifx\bxac@tmpa\bxac@tmpb #2\fi}
+\bxac@do\XeTeXversion{\let\bxac@engine=x}
+\bxac@do\luatexversion{\let\bxac@engine=l}
+\ifx\jsAtEndOfClass\@undefined
+  \let\bxac@delayed@if@bxjs\@firstofone
+\else \let\bxac@delayed@if@bxjs\jsAtEndOfClass
+\fi
+\newif\ifbxac@in@old@behavior
+\let\ImposeOldLuaTeXBehavior\relax
+\let\RevokeOldLuaTeXBehavior\relax
+\ifx x\bxac@engine
+\@onlypreamble\bxac@adjust@charclass
+\bxac@delayed@if@bxjs{%
+  \@ifpackageloaded{xeCJK}{}{%else
+    \ifx\xe@alloc@intercharclass\@undefined\else
+        \ifnum\xe@alloc@intercharclass=\z@
+      \PackageInfo\bxac@pkgname
+        {Setting up interchar class for CJK...\@gobble}%
+      \InputIfFileExists{load-unicode-xetex-classes.tex}{%
+        \xe@alloc@intercharclass=3
+      }{%else
+        \PackageWarning\bxac@pkgname
+          {Cannot find file 'load-unicode-xetex-classes.tex'%
+           \@gobble}%
+      }%
+    \fi\fi
+    \ifnum\XeTeXcharclass"3041=\z@
+      \PackageInfo\bxac@pkgname
+        {Adjusting interchar class for CJK...\@gobble}%
+      \@for\bxac@x:={%
+        3041,3043,3045,3047,3049,3063,3083,3085,3087,308E,%
+        3095,3096,30A1,30A3,30A5,30A7,30A9,30C3,30E3,30E5,%
+        30E7,30EE,30F5,30F6,30FC,31F0,31F1,31F2,31F3,31F4,%
+        31F5,31F6,31F7,31F8,31F9,31FA,31FB,31FC,31FD,31FE,%
+        31FF%
+      }\do{\XeTeXcharclass"\bxac@x=\@ne}%
+    \fi
+  }%
+}
+\fi
+\ifx l\bxac@engine
+\unless\ifnum\luatexversion<80 \ifnum\luatexversion<85
+  \chardef\pdftexversion=200
+  \def\pdftexrevision{0}
+  \let\pdftexbanner\luatexbanner
+\fi\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname outputmode\endcsname\relax\else
+\def\bxac@ob@list{%
+  \do{\let}\pdfoutput{\outputmode}%
+  \do{\let}\pdfpagewidth{\pagewidth}%
+  \do{\let}\pdfpageheight{\pageheight}%
+  \do{\protected\edef}\pdfhorigin{{\pdfvariable horigin}}%
+  \do{\protected\edef}\pdfvorigin{{\pdfvariable vorigin}}}
+\def\bxac@ob@do#1#2{\begingroup
+  \expandafter\bxac@ob@do@a\csname bxac@\string#2\endcsname{#1}#2}
+\def\bxac@ob@do@a#1#2#3#4{\endgroup
+  \ifbxac@in@old@behavior \let#1#3\relax #2#3#4\relax
+  \else \let#3#1\relax \let#1\@undefined
+  \fi}
+\protected\def\ImposeOldLuaTeXBehavior{%
+  \unless\ifbxac@in@old@behavior
+    \bxac@in@old@behaviortrue
+    \let\do\bxac@ob@do \bxac@ob@list
+  \fi}
+\protected\def\RevokeOldLuaTeXBehavior{%
+  \ifbxac@in@old@behavior
+    \bxac@in@old@behaviorfalse
+    \let\do\bxac@ob@do \bxac@ob@list
+  \fi}
+\fi
+  \ifnum\luatexversion>64 \directlua{
+    local function range(cs, ce, cc, ff)
+      if ff or not tex.getcatcode(cs) == cc then
+        local setcc = tex.setcatcode
+        for c = cs, ce do setcc(c, cc) end
+      end
+    end
+    range(0x3400, 0x4DB5, 11, false)
+    range(0x4DB5, 0x4DBF, 11, true)
+    range(0x4E00, 0x9FCC, 11, false)
+    range(0x9FCD, 0x9FFF, 11, true)
+    range(0xAC00, 0xD7A3, 11, false)
+    range(0x20000, 0x2A6D6, 11, false)
+    range(0x2A6D7, 0x2A6FF, 11, true)
+    range(0x2A700, 0x2B734, 11, false)
+    range(0x2B735, 0x2B73F, 11, true)
+    range(0x2B740, 0x2B81D, 11, false)
+    range(0x2B81E, 0x2B81F, 11, true)
+    range(0x2B820, 0x2CEA1, 11, false)
+    range(0x2CEA2, 0x2FFFD, 11, true)
+  }\fi
+\fi
+\endinput
+%%
+%% End of file `bxjscompat.sty'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 19b07e0a31c..78964424a6e 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `drvminimal')
+%% bxjscls.dtx  (with options: `drv,minimal')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -36,7 +36,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \ProvidesFile{bxjsja-minimal.def}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a 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
new file mode 100644
index 00000000000..1121a109c64
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
@@ -0,0 +1,62 @@
+%%
+%% This is file `bxjsja-modern.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bxjscls.dtx  (with options: `drv,modern')
+%% 
+%% IMPORTANT NOTICE:
+%% 
+%% For the copyright see the source file.
+%% 
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from bxjsja-modern.def.
+%% 
+%% For distribution of the original source see the terms
+%% for copying and modification in the file bxjscls.dtx.
+%% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesFile{bxjsja-modern.def}
+  [2016/02/20 v1.1a BXJS document classes]
+\input{bxjsja-standard.def}
+\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
+\def\encodingdefault{T1}%
+\input{t1enc.def}%
+\fontencoding\encodingdefault\selectfont
+\fi
+\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
+\renewcommand{\rmdefault}{lmr}
+\renewcommand{\sfdefault}{lmss}
+\renewcommand{\ttdefault}{lmtt}
+\fi
+\DeclareFontShape{OMX}{cmex}{m}{n}{%
+  <-7.5>cmex7<7.5-8.5>cmex8%
+  <8.5-9.5>cmex9<9.5->cmex10}{}%
+\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
+\def\cmex@opt{10}
+\ifx\@IncludeInRelease\@undefined
+\RequirePackage{fixltx2e}
+\fi
+\RequirePackage{bxjscjkcat}
+\endinput
+%%
+%% End of file `bxjsja-modern.def'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
new file mode 100644
index 00000000000..6177aa0b539
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -0,0 +1,115 @@
+%%
+%% This is file `bxjsja-pandoc.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bxjscls.dtx  (with options: `drv,pandoc')
+%% 
+%% IMPORTANT NOTICE:
+%% 
+%% For the copyright see the source file.
+%% 
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from bxjsja-pandoc.def.
+%% 
+%% For distribution of the original source see the terms
+%% for copying and modification in the file bxjscls.dtx.
+%% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+\ProvidesFile{bxjsja-pandoc.def}
+  [2016/02/20 v1.1a BXJS document classes]
+\input{bxjsja-standard.def}
+\@onlypreamble\bxjs@set@dupload@proc
+\def\bxjs@set@dupload@proc#1{%
+  \expandafter\bxjs@set@dupload@proc@a\csname bxjs@dlp/#1\endcsname}
+\@onlypreamble\bxjs@set@dupload@proc@a
+\def\bxjs@set@dupload@proc@a#1{%
+  \@onlypreamble#1\def#1##1}
+\@onlypreamble\bxjs@org@if@ptions
+\let\bxjs@org@if@ptions\@if@ptions
+\newif\ifbxjs@dlp
+\def\@if@ptions#1#2#3{%
+  \bxjs@dlpfalse
+  \def\bxjs@tmpa{#1}\def\bxjs@tmpb{\@currext}%
+  \ifx\bxjs@tmpa\bxjs@tmpb
+    \expandafter\ifx\csname bxjs@dlp/#2.#1\endcsname\relax\else
+      \bxjs@dlptrue \fi
+  \fi
+  \ifbxjs@dlp \expandafter\bxjs@do@dupload@proc
+  \else \expandafter\bxjs@org@if@ptions
+  \fi {#1}{#2}{#3}}
+\AtBeginDocument{%
+  \let\@if@ptions\bxjs@org@if@ptions}
+\@onlypreamble\bxjs@do@dupload@proc
+\def\bxjs@do@dupload@proc#1#2#3{%
+  \csname bxjs@dlp/#2.#1\endcsname{#3}%
+  \@firstoftwo}
+\def\bxjs@mark@as@loaded#1{%
+  \expandafter\bxjs@mal@a\csname ver@#1\endcsname{#1}}
+\def\bxjs@mal@a#1#2{%
+  \ifx#1\relax
+    \def#1{2001/01/01}%
+    \ClassInfo\bxjs@clsname
+     {File '#2' marked as loaded\@gobble}%
+  \fi}
+\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
+\bxjs@mark@as@loaded{polyglossia.sty}
+\bxjs@set@dupload@proc{polyglossia.sty}{%
+  \ClassWarning\bxjs@clsname
+   {Loading of polyglossia is blocked}}
+\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@tmpa:={#2}\do{%
+    \setotherlangauge{\bxjs@tmpa}}}
+\fi
+\else
+\bxjs@mark@as@loaded{babel.sty}
+\bxjs@set@dupload@proc{babel.sty}{%
+  \ClassWarning\bxjs@clsname
+   {Loading of babel is blocked}}
+\let\foreignlanguage\@secondoftwo
+\let\otherlanguage\@gobble
+\let\endotherlanguage\@empty
+\fi
+\bxjs@set@dupload@proc{geometry.sty}{%
+  \setpagelayout*{#1}}
+\if l\jsEngine
+  \bxjs@mark@as@loaded{xeCJK.sty}
+  \providecommand*{\setCJKmainfont}{\setmainjfont}
+\fi
+\ifx\@IncludeInRelease\@undefined\else
+  \bxjs@mark@as@loaded{fixltx2e.sty}
+\fi
+\if j\jsEngine
+  \bxjs@mark@as@loaded{cmap.sty}
+\fi
+\PassOptionsToPackage{verbose=silent}{microtype}
+\endinput
+%%
+%% End of file `bxjsja-pandoc.def'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index b54778b84ac..e9694decee5 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `drvstandard')
+%% bxjscls.dtx  (with options: `drv,standard')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -36,7 +36,8 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \ProvidesFile{bxjsja-standard.def}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a BXJS document classes]
+%% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \ifjsWitheTeX
   \@tempdima=0.25mm
@@ -153,16 +154,17 @@
   \ifx$#1$\def\bxjs@tmpa{#2}%
   \else \let\bxjs@tmpa\relax
   \fi}
-\def\jsJaChar#1{%
+\newcommand*\jachar[1]{%
   \begingroup
     \jsLetHeadChar\bxjs@tmpa{#1}%
     \ifx\bxjs@tmpa\relax
       \ClassWarningNoLine\bxjs@clsname
-        {Illegal argument given to \string\jsJaChar}%
+        {Illegal argument given to \string\jachar}%
     \else
       \expandafter\bxjs@jachar\expandafter{\bxjs@tmpa}%
     \fi
   \endgroup}
+\let\jsJaChar\jachar
 \let\bxjs@jachar\@firstofone
 \PassOptionsToPackage{setpagesize=false}{hyperref}
 \@onlypreamble\bxjs@fix@hyperref@unicode
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 6234844f826..857671ab85f 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `report')
+%% bxjscls.dtx  (with options: `cls,report')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -37,9 +37,14 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsreport}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a BXJS document classes]
+%% このファイルは日本語文字を含みます
 \RequirePackage{calc}
 \RequirePackage{keyval}
+\IfFileExists{bxjscompat.sty}{%
+  \let\jsAtEndOfClass\@gobble
+  \RequirePackage{bxjscompat}%
+}{}
 \let\jsEngine=n
 \def\bxjs@test@engine#1#2{%
   \edef\bxjs@tmpa{\string#1}%
@@ -66,9 +71,10 @@
   \def\bxjs@robust@def{\DeclareRobustCommand*}
 \fi
 \newif\ifjsInPdfMode
-\ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@
-  \jsInPdfModetrue
-\fi\fi
+\@nameuse{ImposeOldLuaTeXBehavior}
+\RequirePackage{ifpdf}
+\@nameuse{RevokeOldLuaTeXBehavior}
+\let\ifjsInPdfMode\ifpdf
 \@gobbletwo\if\if \def\bxjs@cond#1\fi{%
   #1\expandafter\@firstoftwo
   \else\expandafter\@secondoftwo
@@ -79,6 +85,8 @@
 \let\jsSlide=s
 \let\jsDocClass\jsReport
 \def\bxjs@clsname{bxjsreport}
+\def\jsAtEndOfClass{%
+  \expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
 \@onlypreamble\bxjs@restore@jltrcc
 \let\bxjs@restore@jltrcc\@empty
 \if l\jsEngine
@@ -252,6 +260,12 @@
       \else \@tempdimb=\@tempcntb\@ne \fi}%
     \xdef\bxjs@gtmpa{\the\@tempdimb}%
   \egroup #1=\bxjs@gtmpa\relax}
+\let\bxjs@composite@proc\relax
+\DeclareOption{pandoc}{%
+  \def\bxjs@composite@proc{%
+    \setkeys{bxjs}{ja=pandoc}%
+    \let\bxjs@engine@given=*}%
+  \def\bxjs@driver@opt{dvipdfmx-if-dvi}}
 \DeclareOption{autodetect-engine}{%
   \let\bxjs@engine@given=*}
 \DeclareOption{latex}{%
@@ -346,7 +360,8 @@
 \define@key{bxjs}{paper}{\edef\bxjs@param@paper{#1}}
 \let\bxjs@jadriver\relax
 \define@key{bxjs}{jadriver}{\edef\bxjs@jadriver{#1}}
-\define@key{bxjs}{ja}{\edef\bxjs@jadriver{#1}}
+\define@key{bxjs}{ja}[\relax]{%
+  \ifx\relax#1\else\edef\bxjs@jadriver{#1}\fi}
 \let\jsJaFont\@empty
 \define@key{bxjs}{jafont}{\edef\jsJaFont{#1}}
 \let\jsJaParam\@empty
@@ -371,6 +386,7 @@
   \fi}
 \ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
 \ProcessOptions\relax
+\bxjs@composite@proc
 \@onlypreamble\bxjs@purge@brace@elts
 \def\bxjs@purge@brace@elts{%
   \def\bxjs@tmpa{\@gobble}%
@@ -405,6 +421,11 @@
 \fi\fi
 \ifx *\bxjs@engine@given
   \let\bxjs@engine@given\bxjs@tmpb
+  \ifx j\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,platex}
+  \else\ifx u\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,uplatex}
+  \fi\fi
 \fi
 \ifx\bxjs@engine@given\@undefined\else
   \ifx\bxjs@engine@given\bxjs@tmpb\else
@@ -773,7 +794,9 @@
 \fi
 \edef\bxjs@nxt{%
   \noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}}
+\AtBeginDocument{\ImposeOldLuaTeXBehavior}
 \bxjs@nxt \bxjs@revert
+\AtBeginDocument{\RevokeOldLuaTeXBehavior}
 \bxjs@postproc@layout
 \def\setpagelayout{\@ifstar
   {\bxjs@reset@layout}{\bxjs@modify@layout}}
@@ -859,6 +882,7 @@
   \let\chaptermark\@gobble
   \let\sectionmark\@gobble
 }
+\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}}
 \def\plainifnotempty{%
   \ifx \@oddhead \@empty
     \ifx \@oddfoot \@empty
@@ -883,6 +907,10 @@
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \smallskip
           \@title
+          \ifx\bxjs@subtitle\@undefined\else
+            \par\vskip\z@
+            {\small \bxjs@subtitle\par}
+          \fi
           \smallskip
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \vfill
@@ -892,6 +920,10 @@
       \vskip 60\p@?
       \begin{center}%
         {\LARGE \@title \par}%
+        \ifx\bxjs@subtitle\@undefined\else
+          \vskip5\p@?
+          {\normalsize \bxjs@subtitle\par}
+        \fi
         \vskip 3em%
         {\large
           \lineskip .75em
@@ -957,6 +989,10 @@
     \begin{center}%
       \let\footnote\thanks
       {\LARGE \@title \par}%
+      \ifx\bxjs@subtitle\@undefined\else
+        \vskip3\p@?
+        {\normalsize \bxjs@subtitle\par}
+      \fi
       \vskip 1.5em
       {\large
         \lineskip .5em
@@ -1247,6 +1283,7 @@
     {\normalfont\normalsize\headfont}}
 \fi
 \newcommand\jsParagraphMark{\jsJaChar{■}}
+\let\jsJaChar\@empty
 \if@twocolumn
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {\z@}{-1\jsZw}% 改行せず 1\jsZw のアキ
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 837f91222f8..696b489399c 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% bxjscls.dtx  (with options: `slide')
+%% bxjscls.dtx  (with options: `cls,slide')
 %% 
 %% IMPORTANT NOTICE:
 %% 
@@ -37,9 +37,14 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsslide}
-  [2015/11/21 v1.0d BXJS document classes]
+  [2016/02/20 v1.1a BXJS document classes]
+%% このファイルは日本語文字を含みます
 \RequirePackage{calc}
 \RequirePackage{keyval}
+\IfFileExists{bxjscompat.sty}{%
+  \let\jsAtEndOfClass\@gobble
+  \RequirePackage{bxjscompat}%
+}{}
 \let\jsEngine=n
 \def\bxjs@test@engine#1#2{%
   \edef\bxjs@tmpa{\string#1}%
@@ -66,9 +71,10 @@
   \def\bxjs@robust@def{\DeclareRobustCommand*}
 \fi
 \newif\ifjsInPdfMode
-\ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@
-  \jsInPdfModetrue
-\fi\fi
+\@nameuse{ImposeOldLuaTeXBehavior}
+\RequirePackage{ifpdf}
+\@nameuse{RevokeOldLuaTeXBehavior}
+\let\ifjsInPdfMode\ifpdf
 \@gobbletwo\if\if \def\bxjs@cond#1\fi{%
   #1\expandafter\@firstoftwo
   \else\expandafter\@secondoftwo
@@ -79,6 +85,8 @@
 \let\jsSlide=s
 \let\jsDocClass\jsSlide
 \def\bxjs@clsname{bxjsslide}
+\def\jsAtEndOfClass{%
+  \expandafter\g@addto@macro\csname\bxjs@clsname.cls-h@@k\endcsname}
 \@onlypreamble\bxjs@restore@jltrcc
 \let\bxjs@restore@jltrcc\@empty
 \if l\jsEngine
@@ -248,6 +256,12 @@
       \else \@tempdimb=\@tempcntb\@ne \fi}%
     \xdef\bxjs@gtmpa{\the\@tempdimb}%
   \egroup #1=\bxjs@gtmpa\relax}
+\let\bxjs@composite@proc\relax
+\DeclareOption{pandoc}{%
+  \def\bxjs@composite@proc{%
+    \setkeys{bxjs}{ja=pandoc}%
+    \let\bxjs@engine@given=*}%
+  \def\bxjs@driver@opt{dvipdfmx-if-dvi}}
 \DeclareOption{autodetect-engine}{%
   \let\bxjs@engine@given=*}
 \DeclareOption{latex}{%
@@ -342,7 +356,8 @@
 \define@key{bxjs}{paper}{\edef\bxjs@param@paper{#1}}
 \let\bxjs@jadriver\relax
 \define@key{bxjs}{jadriver}{\edef\bxjs@jadriver{#1}}
-\define@key{bxjs}{ja}{\edef\bxjs@jadriver{#1}}
+\define@key{bxjs}{ja}[\relax]{%
+  \ifx\relax#1\else\edef\bxjs@jadriver{#1}\fi}
 \let\jsJaFont\@empty
 \define@key{bxjs}{jafont}{\edef\jsJaFont{#1}}
 \let\jsJaParam\@empty
@@ -367,6 +382,7 @@
   \fi}
 \ExecuteOptions{36pt,a4paper,landscape,oneside,onecolumn,titlepage,final}
 \ProcessOptions\relax
+\bxjs@composite@proc
 \@onlypreamble\bxjs@purge@brace@elts
 \def\bxjs@purge@brace@elts{%
   \def\bxjs@tmpa{\@gobble}%
@@ -401,6 +417,11 @@
 \fi\fi
 \ifx *\bxjs@engine@given
   \let\bxjs@engine@given\bxjs@tmpb
+  \ifx j\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,platex}
+  \else\ifx u\bxjs@engine@given
+    \g@addto@macro\@classoptionslist{,uplatex}
+  \fi\fi
 \fi
 \ifx\bxjs@engine@given\@undefined\else
   \ifx\bxjs@engine@given\bxjs@tmpb\else
@@ -767,7 +788,9 @@
 \fi
 \edef\bxjs@nxt{%
   \noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}}
+\AtBeginDocument{\ImposeOldLuaTeXBehavior}
 \bxjs@nxt \bxjs@revert
+\AtBeginDocument{\RevokeOldLuaTeXBehavior}
 \bxjs@postproc@layout
 \def\setpagelayout{\@ifstar
   {\bxjs@reset@layout}{\bxjs@modify@layout}}
@@ -858,6 +881,7 @@
   \let\sectionmark\@gobble
   \let\subsectionmark\@gobble
 }
+\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}}
 \def\plainifnotempty{%
   \ifx \@oddhead \@empty
     \ifx \@oddfoot \@empty
@@ -882,6 +906,10 @@
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \smallskip
           \@title
+          \ifx\bxjs@subtitle\@undefined\else
+            \par\vskip\z@
+            {\small \bxjs@subtitle\par}
+          \fi
           \smallskip
           {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
           \vfill
@@ -891,6 +919,10 @@
       \vskip 60\p@?
       \begin{center}%
         {\LARGE \@title \par}%
+        \ifx\bxjs@subtitle\@undefined\else
+          \vskip5\p@?
+          {\normalsize \bxjs@subtitle\par}
+        \fi
         \vskip 3em%
         {\large
           \lineskip .75em
@@ -956,6 +988,10 @@
     \begin{center}%
       \let\footnote\thanks
       {\LARGE \@title \par}%
+      \ifx\bxjs@subtitle\@undefined\else
+        \vskip3\p@?
+        {\normalsize \bxjs@subtitle\par}
+      \fi
       \vskip 1.5em
       {\large
         \lineskip .5em
@@ -1156,6 +1192,7 @@
     {\normalfont\normalsize\headfont}}
 \fi
 \newcommand\jsParagraphMark{\jsJaChar{■}}
+\let\jsJaChar\@empty
 \if@twocolumn
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {\z@}{-1\jsZw}% 改行せず 1\jsZw のアキ