summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-09 22:34:23 +0000
committerKarl Berry <karl@freefriends.org>2017-09-09 22:34:23 +0000
commit75c347aa5d28ca016031edd7a09f4979f99dc5fc (patch)
tree6589cef852d640f87cb89680e2f6fbe0b128466b /Master/texmf-dist/tex
parente94d686213b25e06fdc7b227bcb3d7baaf67c06a (diff)
bxjscls (9sep17)
git-svn-id: svn://tug.org/texlive/trunk@45252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls81
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls81
-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.def4
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls82
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls81
10 files changed, 250 insertions, 91 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 0fb497d6d95..7d9e6dde4b2 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -22,8 +22,11 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2017/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます.
+\def\bxjs@clsname{bxjsarticle}
+\newif\ifjsc@needsp@tch
+\jsc@needsp@tchfalse
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{bxjscompat.sty}{%
@@ -35,7 +38,6 @@
\let\jsReport=r
\let\jsSlide=s
\let\jsDocClass\jsArticle
-\def\bxjs@clsname{bxjsarticle}
\let\jsEngine=n
\def\bxjs@test@engine#1#2{%
\edef\bxjs@tmpa{\string#1}%
@@ -134,6 +136,8 @@
\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
@@ -194,7 +198,28 @@
\DeclareOption{usemag}{\let\bxjs@magstyle\bxjs@magstyle@usemag}
\DeclareOption{nomag}{\let\bxjs@magstyle\bxjs@magstyle@nomag}
\DeclareOption{nomag*}{\let\bxjs@magstyle\bxjs@magstyle@xreal}
-\newdimen\stockwidth \newdimen\stockheight
+\if j\jsEngine
+\hour\time \divide\hour by 60\relax
+\@tempcnta\hour \multiply\@tempcnta 60\relax
+\minute\time \advance\minute-\@tempcnta
+\DeclareOption{tombow}{%
+ \tombowtrue \tombowdatetrue
+ \setlength{\@tombowwidth}{.1\p@}%
+ \@bannertoken{%
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
+ \maketombowbox}
+\DeclareOption{tombo}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{.1\p@}%
+ \maketombowbox}
+\fi
+\if j\jsEngine
+\DeclareOption{mentuke}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{\z@}%
+ \maketombowbox}
+\fi
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
\DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse}
@@ -533,6 +558,14 @@
\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
\ProcessOptions\relax
\bxjs@composite@proc
+\if@slide
+ \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
+\fi
+\if@landscape
+ \setlength\@tempdima {\paperheight}
+ \setlength\paperheight{\paperwidth}
+ \setlength\paperwidth {\@tempdima}
+\fi
\@onlypreamble\bxjs@purge@brace@elts
\def\bxjs@purge@brace@elts{%
\def\bxjs@tmpa{\@gobble}%
@@ -667,14 +700,6 @@
\fi
\bxjs@do@opt@jbase
\let\Cjascale\jsScale
-\if@slide
- \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
-\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
\@tempcnta="80 \loop \ifnum\@tempcnta<"100
\catcode\@tempcnta\active
@@ -689,6 +714,14 @@
\ifbxjs@oldfontcommands
\AtEndOfClass{\allowoldfontcommands}
\fi
+\newdimen\stockwidth \newdimen\stockheight
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname iftombow\expandafter\endcsname\csname iftrue\endcsname
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+\fi
\ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}%
\else \def\n@baseline{16}\fi
\ifx\bxjs@magstyle\bxjs@magstyle@mag
@@ -716,13 +749,15 @@
\expandafter\bxjs@tmpa\the\@tempcnta\@nil
\edef\jsc@magscale{\strip@pt\@tempdima}
\let\jsBaseFontSize\bxjs@param@basefontsize
+\newdimen\jsc@mpt
+\newdimen\jsc@mmm
\ifjsc@mag
- \let\jsc@mpt\p@
- \newdimen\jsc@mmm \jsc@mmm=1mm
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
\catcode`\?=9 % \p@? read as \p@
\else
- \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@
- \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
\catcode`\?=11 \let\p@?\jsc@mpt
\fi
\chardef\bxjs@qmcc=\catcode`\?\relax
@@ -892,13 +927,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\sffamily}
\setlength\columnsep{2\Cwd}
-\setlength\columnseprule{0\p@}
-\setlength\lineskip{1\p@?}
-\setlength\normallineskip{1\p@?}
-\setlength\lineskiplimit{1\p@?}
-\setlength\normallineskiplimit{1\p@?}
+\setlength\columnseprule{0\jsc@mpt}
+\setlength\lineskip{1\jsc@mpt}
+\setlength\normallineskip{1\jsc@mpt}
+\setlength\lineskiplimit{1\jsc@mpt}
+\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
-\setlength\parskip{0\p@}
+\setlength\parskip{0\jsc@mpt}
\if@slide
\setlength\parindent{0\p@}
\else
@@ -1986,6 +2021,10 @@
\def\par{%
\@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
\everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
+\def\@setminipage{%
+ \@minipagetrue
+ \everypar{\@minipagefalse\everypar{\everyparhook}}%
+}
\def\@item[#1]{%
\if@noparitem
\@donoparitem
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 4a26095ac6f..c1edf302d0a 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -22,8 +22,11 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2017/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます.
+\def\bxjs@clsname{bxjsbook}
+\newif\ifjsc@needsp@tch
+\jsc@needsp@tchfalse
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{bxjscompat.sty}{%
@@ -35,7 +38,6 @@
\let\jsReport=r
\let\jsSlide=s
\let\jsDocClass\jsBook
-\def\bxjs@clsname{bxjsbook}
\let\jsEngine=n
\def\bxjs@test@engine#1#2{%
\edef\bxjs@tmpa{\string#1}%
@@ -137,6 +139,8 @@
\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
@@ -197,7 +201,28 @@
\DeclareOption{usemag}{\let\bxjs@magstyle\bxjs@magstyle@usemag}
\DeclareOption{nomag}{\let\bxjs@magstyle\bxjs@magstyle@nomag}
\DeclareOption{nomag*}{\let\bxjs@magstyle\bxjs@magstyle@xreal}
-\newdimen\stockwidth \newdimen\stockheight
+\if j\jsEngine
+\hour\time \divide\hour by 60\relax
+\@tempcnta\hour \multiply\@tempcnta 60\relax
+\minute\time \advance\minute-\@tempcnta
+\DeclareOption{tombow}{%
+ \tombowtrue \tombowdatetrue
+ \setlength{\@tombowwidth}{.1\p@}%
+ \@bannertoken{%
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
+ \maketombowbox}
+\DeclareOption{tombo}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{.1\p@}%
+ \maketombowbox}
+\fi
+\if j\jsEngine
+\DeclareOption{mentuke}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{\z@}%
+ \maketombowbox}
+\fi
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
\DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse}
@@ -542,6 +567,14 @@
\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
\ProcessOptions\relax
\bxjs@composite@proc
+\if@slide
+ \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
+\fi
+\if@landscape
+ \setlength\@tempdima {\paperheight}
+ \setlength\paperheight{\paperwidth}
+ \setlength\paperwidth {\@tempdima}
+\fi
\@onlypreamble\bxjs@purge@brace@elts
\def\bxjs@purge@brace@elts{%
\def\bxjs@tmpa{\@gobble}%
@@ -676,14 +709,6 @@
\fi
\bxjs@do@opt@jbase
\let\Cjascale\jsScale
-\if@slide
- \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
-\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
\@tempcnta="80 \loop \ifnum\@tempcnta<"100
\catcode\@tempcnta\active
@@ -698,6 +723,14 @@
\ifbxjs@oldfontcommands
\AtEndOfClass{\allowoldfontcommands}
\fi
+\newdimen\stockwidth \newdimen\stockheight
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname iftombow\expandafter\endcsname\csname iftrue\endcsname
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+\fi
\ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}%
\else \def\n@baseline{16}\fi
\ifx\bxjs@magstyle\bxjs@magstyle@mag
@@ -725,13 +758,15 @@
\expandafter\bxjs@tmpa\the\@tempcnta\@nil
\edef\jsc@magscale{\strip@pt\@tempdima}
\let\jsBaseFontSize\bxjs@param@basefontsize
+\newdimen\jsc@mpt
+\newdimen\jsc@mmm
\ifjsc@mag
- \let\jsc@mpt\p@
- \newdimen\jsc@mmm \jsc@mmm=1mm
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
\catcode`\?=9 % \p@? read as \p@
\else
- \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@
- \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
\catcode`\?=11 \let\p@?\jsc@mpt
\fi
\chardef\bxjs@qmcc=\catcode`\?\relax
@@ -901,13 +936,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\sffamily}
\setlength\columnsep{2\Cwd}
-\setlength\columnseprule{0\p@}
-\setlength\lineskip{1\p@?}
-\setlength\normallineskip{1\p@?}
-\setlength\lineskiplimit{1\p@?}
-\setlength\normallineskiplimit{1\p@?}
+\setlength\columnseprule{0\jsc@mpt}
+\setlength\lineskip{1\jsc@mpt}
+\setlength\normallineskip{1\jsc@mpt}
+\setlength\lineskiplimit{1\jsc@mpt}
+\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
-\setlength\parskip{0\p@}
+\setlength\parskip{0\jsc@mpt}
\if@slide
\setlength\parindent{0\p@}
\else
@@ -2093,6 +2128,10 @@
\def\par{%
\@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
\everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
+\def\@setminipage{%
+ \@minipagetrue
+ \everypar{\@minipagefalse\everypar{\everyparhook}}%
+}
\def\@item[#1]{%
\if@noparitem
\@donoparitem
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index e16e4375bac..d5d539f1497 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/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 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 289b4deb452..6bda051b740 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/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 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 58f9f1b6d75..cd79362ec15 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/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
@@ -188,8 +188,10 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareJaTextFontCommand{\textmc}{\mcfamily}
\DeclareJaTextFontCommand{\textgt}{\gtfamily}
+\fi
\bxjs@if@sf@default{%
\renewcommand\kanjifamilydefault{\gtdefault}}
\selectfont
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 0494661ebb4..c55014f5cce 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/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 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 f755ee161cd..34044de2fec 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/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 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 a8deb543153..0e8387a6636 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2017/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -564,8 +564,10 @@
LuaTeX-ja always provides Japanese math families}
\fi
\fi\fi\fi\fi
+\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareJaTextFontCommand{\textmc}{\mcfamily}
\DeclareJaTextFontCommand{\textgt}{\gtfamily}
+\fi
\ifx\mathmc\@undefined
\DeclareJaMathFontCommand{\mathmc}{\mcfamily}
\DeclareJaMathFontCommand{\mathgt}{\gtfamily}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index daef5fc5b60..945ae1331e4 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -22,8 +22,11 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2017/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます.
+\def\bxjs@clsname{bxjsreport}
+\newif\ifjsc@needsp@tch
+\jsc@needsp@tchfalse
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{bxjscompat.sty}{%
@@ -35,7 +38,6 @@
\let\jsReport=r
\let\jsSlide=s
\let\jsDocClass\jsReport
-\def\bxjs@clsname{bxjsreport}
\let\jsEngine=n
\def\bxjs@test@engine#1#2{%
\edef\bxjs@tmpa{\string#1}%
@@ -137,6 +139,8 @@
\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
@@ -197,7 +201,28 @@
\DeclareOption{usemag}{\let\bxjs@magstyle\bxjs@magstyle@usemag}
\DeclareOption{nomag}{\let\bxjs@magstyle\bxjs@magstyle@nomag}
\DeclareOption{nomag*}{\let\bxjs@magstyle\bxjs@magstyle@xreal}
-\newdimen\stockwidth \newdimen\stockheight
+\if j\jsEngine
+\hour\time \divide\hour by 60\relax
+\@tempcnta\hour \multiply\@tempcnta 60\relax
+\minute\time \advance\minute-\@tempcnta
+\DeclareOption{tombow}{%
+ \tombowtrue \tombowdatetrue
+ \setlength{\@tombowwidth}{.1\p@}%
+ \@bannertoken{%
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
+ \maketombowbox}
+\DeclareOption{tombo}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{.1\p@}%
+ \maketombowbox}
+\fi
+\if j\jsEngine
+\DeclareOption{mentuke}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{\z@}%
+ \maketombowbox}
+\fi
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
\DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse}
@@ -508,7 +533,6 @@
\fi}
\newif\ifbxjs@layout@buggyhmargin
\newif\ifbxjs@force@chapterabstract
-\bxjs@force@chapterabstracttrue
\@namedef{bxjs@kv@layout@v1}{%
\bxjs@force@chapterabstracttrue
}
@@ -542,6 +566,14 @@
\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
\ProcessOptions\relax
\bxjs@composite@proc
+\if@slide
+ \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
+\fi
+\if@landscape
+ \setlength\@tempdima {\paperheight}
+ \setlength\paperheight{\paperwidth}
+ \setlength\paperwidth {\@tempdima}
+\fi
\@onlypreamble\bxjs@purge@brace@elts
\def\bxjs@purge@brace@elts{%
\def\bxjs@tmpa{\@gobble}%
@@ -676,14 +708,6 @@
\fi
\bxjs@do@opt@jbase
\let\Cjascale\jsScale
-\if@slide
- \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
-\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
\@tempcnta="80 \loop \ifnum\@tempcnta<"100
\catcode\@tempcnta\active
@@ -698,6 +722,14 @@
\ifbxjs@oldfontcommands
\AtEndOfClass{\allowoldfontcommands}
\fi
+\newdimen\stockwidth \newdimen\stockheight
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname iftombow\expandafter\endcsname\csname iftrue\endcsname
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+\fi
\ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}%
\else \def\n@baseline{16}\fi
\ifx\bxjs@magstyle\bxjs@magstyle@mag
@@ -725,13 +757,15 @@
\expandafter\bxjs@tmpa\the\@tempcnta\@nil
\edef\jsc@magscale{\strip@pt\@tempdima}
\let\jsBaseFontSize\bxjs@param@basefontsize
+\newdimen\jsc@mpt
+\newdimen\jsc@mmm
\ifjsc@mag
- \let\jsc@mpt\p@
- \newdimen\jsc@mmm \jsc@mmm=1mm
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
\catcode`\?=9 % \p@? read as \p@
\else
- \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@
- \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
\catcode`\?=11 \let\p@?\jsc@mpt
\fi
\chardef\bxjs@qmcc=\catcode`\?\relax
@@ -901,13 +935,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\sffamily}
\setlength\columnsep{2\Cwd}
-\setlength\columnseprule{0\p@}
-\setlength\lineskip{1\p@?}
-\setlength\normallineskip{1\p@?}
-\setlength\lineskiplimit{1\p@?}
-\setlength\normallineskiplimit{1\p@?}
+\setlength\columnseprule{0\jsc@mpt}
+\setlength\lineskip{1\jsc@mpt}
+\setlength\normallineskip{1\jsc@mpt}
+\setlength\lineskiplimit{1\jsc@mpt}
+\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
-\setlength\parskip{0\p@}
+\setlength\parskip{0\jsc@mpt}
\if@slide
\setlength\parindent{0\p@}
\else
@@ -2124,6 +2158,10 @@
\def\par{%
\@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
\everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
+\def\@setminipage{%
+ \@minipagetrue
+ \everypar{\@minipagefalse\everypar{\everyparhook}}%
+}
\def\@item[#1]{%
\if@noparitem
\@donoparitem
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 69bfbed30a6..990ecdbbb3b 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -22,8 +22,11 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2017/07/07 v1.5d BXJS document classes]
+ [2017/09/09 v1.6 BXJS document classes]
%% このファイルは日本語文字を含みます.
+\def\bxjs@clsname{bxjsslide}
+\newif\ifjsc@needsp@tch
+\jsc@needsp@tchfalse
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{bxjscompat.sty}{%
@@ -35,7 +38,6 @@
\let\jsReport=r
\let\jsSlide=s
\let\jsDocClass\jsSlide
-\def\bxjs@clsname{bxjsslide}
\let\jsEngine=n
\def\bxjs@test@engine#1#2{%
\edef\bxjs@tmpa{\string#1}%
@@ -134,6 +136,8 @@
\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
@@ -194,7 +198,28 @@
\DeclareOption{usemag}{\let\bxjs@magstyle\bxjs@magstyle@usemag}
\DeclareOption{nomag}{\let\bxjs@magstyle\bxjs@magstyle@nomag}
\DeclareOption{nomag*}{\let\bxjs@magstyle\bxjs@magstyle@xreal}
-\newdimen\stockwidth \newdimen\stockheight
+\if j\jsEngine
+\hour\time \divide\hour by 60\relax
+\@tempcnta\hour \multiply\@tempcnta 60\relax
+\minute\time \advance\minute-\@tempcnta
+\DeclareOption{tombow}{%
+ \tombowtrue \tombowdatetrue
+ \setlength{\@tombowwidth}{.1\p@}%
+ \@bannertoken{%
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
+ \maketombowbox}
+\DeclareOption{tombo}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{.1\p@}%
+ \maketombowbox}
+\fi
+\if j\jsEngine
+\DeclareOption{mentuke}{%
+ \tombowtrue \tombowdatefalse
+ \setlength{\@tombowwidth}{\z@}%
+ \maketombowbox}
+\fi
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
\DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse}
@@ -533,6 +558,14 @@
\ExecuteOptions{36pt,a4paper,landscape,oneside,onecolumn,titlepage,final}
\ProcessOptions\relax
\bxjs@composite@proc
+\if@slide
+ \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
+\fi
+\if@landscape
+ \setlength\@tempdima {\paperheight}
+ \setlength\paperheight{\paperwidth}
+ \setlength\paperwidth {\@tempdima}
+\fi
\@onlypreamble\bxjs@purge@brace@elts
\def\bxjs@purge@brace@elts{%
\def\bxjs@tmpa{\@gobble}%
@@ -667,14 +700,6 @@
\fi
\bxjs@do@opt@jbase
\let\Cjascale\jsScale
-\if@slide
- \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
-\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
\@tempcnta="80 \loop \ifnum\@tempcnta<"100
\catcode\@tempcnta\active
@@ -689,6 +714,14 @@
\ifbxjs@oldfontcommands
\AtEndOfClass{\allowoldfontcommands}
\fi
+\newdimen\stockwidth \newdimen\stockheight
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname iftombow\expandafter\endcsname\csname iftrue\endcsname
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+\fi
\def\n@baseline{13}%
\ifx\bxjs@magstyle\bxjs@magstyle@mag
\jsc@magtrue
@@ -715,13 +748,15 @@
\expandafter\bxjs@tmpa\the\@tempcnta\@nil
\edef\jsc@magscale{\strip@pt\@tempdima}
\let\jsBaseFontSize\bxjs@param@basefontsize
+\newdimen\jsc@mpt
+\newdimen\jsc@mmm
\ifjsc@mag
- \let\jsc@mpt\p@
- \newdimen\jsc@mmm \jsc@mmm=1mm
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
\catcode`\?=9 % \p@? read as \p@
\else
- \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@
- \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
\catcode`\?=11 \let\p@?\jsc@mpt
\fi
\chardef\bxjs@qmcc=\catcode`\?\relax
@@ -891,13 +926,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\sffamily}
\setlength\columnsep{2\Cwd}
-\setlength\columnseprule{0\p@}
-\setlength\lineskip{1\p@?}
-\setlength\normallineskip{1\p@?}
-\setlength\lineskiplimit{1\p@?}
-\setlength\normallineskiplimit{1\p@?}
+\setlength\columnseprule{0\jsc@mpt}
+\setlength\lineskip{1\jsc@mpt}
+\setlength\normallineskip{1\jsc@mpt}
+\setlength\lineskiplimit{1\jsc@mpt}
+\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
-\setlength\parskip{0\p@}
+\setlength\parskip{0\jsc@mpt}
\if@slide
\setlength\parindent{0\p@}
\else
@@ -1984,6 +2019,10 @@
\def\par{%
\@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
\everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
+\def\@setminipage{%
+ \@minipagetrue
+ \everypar{\@minipagefalse\everypar{\everyparhook}}%
+}
\def\@item[#1]{%
\if@noparitem
\@donoparitem