1 files changed, 43 insertions, 6 deletions
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 のアキ