From 1f575200f08d8ba2447a31c849674502b41ab179 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Jul 2016 21:26:56 +0000 Subject: bxjscls (17jul16) git-svn-id: svn://tug.org/texlive/trunk@41717 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 106 ++++++++++--------- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 116 ++++++++++++--------- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 18 +++- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../tex/latex/bxjscls/bxjsja-standard.def | 4 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 112 +++++++++++--------- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 106 ++++++++++--------- 10 files changed, 267 insertions(+), 203 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 5c56383c0ec..5a96d0e1135 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -156,6 +156,7 @@ \ClassWarningNoLine\bxjs@clsname {You should not use 'true' lengths here}% \fi} +\newif\ifjsc@mag \DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}} \DeclareOption{9pt}{\bxjs@setbasefontsize{9pt}} \DeclareOption{10pt}{\bxjs@setbasefontsize{10pt}} @@ -175,6 +176,10 @@ \DeclareOption{10.5ptj}{\bxjs@setjbasefontsize{10.5pt}} \DeclareOption{11ptj}{\bxjs@setjbasefontsize{11pt}} \DeclareOption{12ptj}{\bxjs@setjbasefontsize{12pt}} +\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 \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} \DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} \DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse} @@ -387,7 +392,10 @@ \let\bxjs@magstyle@mag=m \let\bxjs@magstyle@real=r \let\bxjs@magstyle@xreal=x -\let\bxjs@magstyle@default\bxjs@magstyle@mag +\let\bxjs@magstyle@usemag\bxjs@magstyle@mag +\let\bxjs@magstyle@nomag\bxjs@magstyle@real +\expandafter\let\csname bxjs@magstyle@nomag*\endcsname\bxjs@magstyle@xreal +\let\bxjs@magstyle@default\bxjs@magstyle@usemag \ifx l\jsEngine \ifnum\luatexversion>86 \let\bxjs@magstyle@default\bxjs@magstyle@xreal \fi\fi @@ -398,7 +406,7 @@ \ifx\bxjs@magstyle\relax \ClassError\bxjs@clsname {Invalid magstyle value `#1'}\@ehc - \let\bxjs@magstyle\bxjs@magstyle@mag + \let\bxjs@magstyle\bxjs@magstyle@default \fi} \let\bxjs@ltx@removeelement\@removeelement \def\@removeelement#1#2#3{% @@ -537,12 +545,12 @@ \def\bxjs@js@clsname{jsarticle} \@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)} \fi +\g@addto@macro\@classoptionslist{,nosetpagesize} \ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}% \else \def\n@baseline{16}\fi -\newif\ifbxjs@mag \newif\ifbxjs@nfss@patch \ifx\bxjs@magstyle\bxjs@magstyle@mag - \bxjs@magtrue + \jsc@magtrue \else\ifx\bxjs@magstyle\bxjs@magstyle@xreal \bxjs@nfss@patchtrue \fi\fi @@ -564,19 +572,20 @@ \@tempcnta\bxjs@param@mag \advance\@tempcnta100000 \def\bxjs@tmpa#1#2#3#4\@nil{\@tempdima=#2#3.#4\p@} \expandafter\bxjs@tmpa\the\@tempcnta\@nil -\edef\bxjs@real@mag{\strip@pt\@tempdima} +\edef\jsc@magscale{\strip@pt\@tempdima} \let\jsBaseFontSize\bxjs@param@basefontsize -\ifbxjs@mag - \let\bxjs@mpt\p@ +\ifjsc@mag + \let\jsc@mpt\p@ + \newdimen\jsc@mmm \jsc@mmm=1mm \catcode`\?=9 % \p@? read as \p@ \else - \newdimen\bxjs@mpt - \bxjs@mpt=\bxjs@real@mag \p@ - \catcode`\?=11 \let\p@?\bxjs@mpt + \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@ + \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm + \catcode`\?=11 \let\p@?\jsc@mpt \fi \chardef\bxjs@qmcc=\catcode`\?\relax \newdimen\jsZw -\jsZw=10\bxjs@mpt \jsZw=\jsScale\jsZw +\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw \ifbxjs@usezw \providecommand*\zw{\jsZw} \fi @@ -598,7 +607,7 @@ \fi} \def\bxjs@preadjust@extract@font{% \let\bxjs@req@size\f@size - \dimen@\f@size\p@ \bxjs@invscale\dimen@\bxjs@real@mag + \dimen@\f@size\p@ \bxjs@invscale\dimen@\jsc@magscale \advance\dimen@.005pt\relax \bxjs@fstrunc\dimen@ \let\bxjs@ref@size\bxjs@tmpa \let\f@size\bxjs@ref@size} @@ -608,7 +617,7 @@ \csname s@fct@#1\endcsname} \let\bxjs@DeclareErrorFont\DeclareErrorFont \def\DeclareErrorFont#1#2#3#4#5{% - \@tempdimc#5\p@ \@tempdimc\bxjs@real@mag\@tempdimc + \@tempdimc#5\p@ \@tempdimc\jsc@magscale\@tempdimc \edef\bxjs@tmpa{{#1}{#2}{#3}{#4}{\strip@pt\@tempdimc}} \expandafter\bxjs@DeclareErrorFont\bxjs@tmpa} \def\gen@sfcnt{% @@ -621,7 +630,8 @@ \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi \chardef\bxjs@periodchar=`\. -\def\@{\spacefactor\sfcode\bxjs@periodchar} +\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} +\def\@{\bxjs@SE{}} \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -639,11 +649,11 @@ \fi\relax \jsResetDimen} \newcommand*\jsResetDimen{} -\ifbxjs@mag - \let\bxjs@setfontsize\@setfontsize +\ifjsc@mag + \let\jsc@setfontsize\@setfontsize \else - \def\bxjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\bxjs@mpt}{#3\bxjs@mpt}} + \def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \fi \emergencystretch 3\jsZw \newif\ifnarrowbaselines @@ -672,9 +682,9 @@ } \renewcommand{\normalsize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\normalsize\@xpt\@xiipt + \jsc@setfontsize\normalsize\@xpt\@xiipt }{%else - \bxjs@setfontsize\normalsize\@xpt{\n@baseline}% + \jsc@setfontsize\normalsize\@xpt{\n@baseline}% }% \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -694,9 +704,9 @@ \setlength\Chs{1\jsZw} \newcommand{\small}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% }{%else - \bxjs@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% }% \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -708,9 +718,9 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% }{%else - \bxjs@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% }% \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@? \abovedisplayshortskip \z@ \@plus2\p@? @@ -720,18 +730,18 @@ \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\bxjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\bxjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\bxjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\bxjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\bxjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\bxjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\bxjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} @@ -750,7 +760,7 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\ifbxjs@mag +\ifjsc@mag \mag=\bxjs@param@mag \fi \setlength{\topskip}{10\p@?} @@ -762,7 +772,7 @@ \def\bxjs@read@d#1\@nil{} \expandafter\bxjs@read@a\bxjs@param@paper\@nil \edef\bxjs@layout@paper{% - \ifbxjs@mag truedimen,\fi + \ifjsc@mag truedimen,\fi \if@landscape landscape,\fi \bxjs@param@paper} \def\bxjs@layout{% @@ -793,9 +803,11 @@ \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% - -\textwidth-1cm-\marginparsep} + -\textwidth-10\jsc@mmm-\marginparsep} \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd \maxdepth=.5\topskip + \stockwidth=\paperwidth + \stockheight=\paperheight } \@onlypreamble\bxjs@revert \let\bxjs@revert\@empty @@ -1485,12 +1497,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}% + \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\jsZw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\jsZw\fi + \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\jsZw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\jsZw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1519,22 +1531,22 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\jsZw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2\jsZw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\jsZw \@dottedtocline{2}{\@tempdima}{3\jsZw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 0\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 0\jsZw \@dottedtocline{3}{\@tempdima}{4\jsZw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 1\jsZw \@dottedtocline{4}{\@tempdima}{5\jsZw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 2\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 2\jsZw \@dottedtocline{5}{\@tempdima}{6\jsZw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} @@ -1635,7 +1647,7 @@ \def\footnotemark{\jsInhibitGlue\footnotemarks@ve} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@? + \kern-2.6\p@? \kern-.4\p@ \hrule width .4\columnwidth \kern 2.6\p@?} \long\def\@footnotetext{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 60b2e4064c3..f221563743f 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -158,6 +158,7 @@ \ClassWarningNoLine\bxjs@clsname {You should not use 'true' lengths here}% \fi} +\newif\ifjsc@mag \DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}} \DeclareOption{9pt}{\bxjs@setbasefontsize{9pt}} \DeclareOption{10pt}{\bxjs@setbasefontsize{10pt}} @@ -177,6 +178,10 @@ \DeclareOption{10.5ptj}{\bxjs@setjbasefontsize{10.5pt}} \DeclareOption{11ptj}{\bxjs@setjbasefontsize{11pt}} \DeclareOption{12ptj}{\bxjs@setjbasefontsize{12pt}} +\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 \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} \DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} \DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse} @@ -391,7 +396,10 @@ \let\bxjs@magstyle@mag=m \let\bxjs@magstyle@real=r \let\bxjs@magstyle@xreal=x -\let\bxjs@magstyle@default\bxjs@magstyle@mag +\let\bxjs@magstyle@usemag\bxjs@magstyle@mag +\let\bxjs@magstyle@nomag\bxjs@magstyle@real +\expandafter\let\csname bxjs@magstyle@nomag*\endcsname\bxjs@magstyle@xreal +\let\bxjs@magstyle@default\bxjs@magstyle@usemag \ifx l\jsEngine \ifnum\luatexversion>86 \let\bxjs@magstyle@default\bxjs@magstyle@xreal \fi\fi @@ -402,7 +410,7 @@ \ifx\bxjs@magstyle\relax \ClassError\bxjs@clsname {Invalid magstyle value `#1'}\@ehc - \let\bxjs@magstyle\bxjs@magstyle@mag + \let\bxjs@magstyle\bxjs@magstyle@default \fi} \let\bxjs@ltx@removeelement\@removeelement \def\@removeelement#1#2#3{% @@ -541,12 +549,12 @@ \def\bxjs@js@clsname{jsbook} \@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)} \fi +\g@addto@macro\@classoptionslist{,nosetpagesize} \ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}% \else \def\n@baseline{16}\fi -\newif\ifbxjs@mag \newif\ifbxjs@nfss@patch \ifx\bxjs@magstyle\bxjs@magstyle@mag - \bxjs@magtrue + \jsc@magtrue \else\ifx\bxjs@magstyle\bxjs@magstyle@xreal \bxjs@nfss@patchtrue \fi\fi @@ -568,19 +576,20 @@ \@tempcnta\bxjs@param@mag \advance\@tempcnta100000 \def\bxjs@tmpa#1#2#3#4\@nil{\@tempdima=#2#3.#4\p@} \expandafter\bxjs@tmpa\the\@tempcnta\@nil -\edef\bxjs@real@mag{\strip@pt\@tempdima} +\edef\jsc@magscale{\strip@pt\@tempdima} \let\jsBaseFontSize\bxjs@param@basefontsize -\ifbxjs@mag - \let\bxjs@mpt\p@ +\ifjsc@mag + \let\jsc@mpt\p@ + \newdimen\jsc@mmm \jsc@mmm=1mm \catcode`\?=9 % \p@? read as \p@ \else - \newdimen\bxjs@mpt - \bxjs@mpt=\bxjs@real@mag \p@ - \catcode`\?=11 \let\p@?\bxjs@mpt + \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@ + \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm + \catcode`\?=11 \let\p@?\jsc@mpt \fi \chardef\bxjs@qmcc=\catcode`\?\relax \newdimen\jsZw -\jsZw=10\bxjs@mpt \jsZw=\jsScale\jsZw +\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw \ifbxjs@usezw \providecommand*\zw{\jsZw} \fi @@ -602,7 +611,7 @@ \fi} \def\bxjs@preadjust@extract@font{% \let\bxjs@req@size\f@size - \dimen@\f@size\p@ \bxjs@invscale\dimen@\bxjs@real@mag + \dimen@\f@size\p@ \bxjs@invscale\dimen@\jsc@magscale \advance\dimen@.005pt\relax \bxjs@fstrunc\dimen@ \let\bxjs@ref@size\bxjs@tmpa \let\f@size\bxjs@ref@size} @@ -612,7 +621,7 @@ \csname s@fct@#1\endcsname} \let\bxjs@DeclareErrorFont\DeclareErrorFont \def\DeclareErrorFont#1#2#3#4#5{% - \@tempdimc#5\p@ \@tempdimc\bxjs@real@mag\@tempdimc + \@tempdimc#5\p@ \@tempdimc\jsc@magscale\@tempdimc \edef\bxjs@tmpa{{#1}{#2}{#3}{#4}{\strip@pt\@tempdimc}} \expandafter\bxjs@DeclareErrorFont\bxjs@tmpa} \def\gen@sfcnt{% @@ -625,7 +634,8 @@ \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi \chardef\bxjs@periodchar=`\. -\def\@{\spacefactor\sfcode\bxjs@periodchar} +\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} +\def\@{\bxjs@SE{}} \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -643,11 +653,11 @@ \fi\relax \jsResetDimen} \newcommand*\jsResetDimen{} -\ifbxjs@mag - \let\bxjs@setfontsize\@setfontsize +\ifjsc@mag + \let\jsc@setfontsize\@setfontsize \else - \def\bxjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\bxjs@mpt}{#3\bxjs@mpt}} + \def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \fi \emergencystretch 3\jsZw \newif\ifnarrowbaselines @@ -676,9 +686,9 @@ } \renewcommand{\normalsize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\normalsize\@xpt\@xiipt + \jsc@setfontsize\normalsize\@xpt\@xiipt }{%else - \bxjs@setfontsize\normalsize\@xpt{\n@baseline}% + \jsc@setfontsize\normalsize\@xpt{\n@baseline}% }% \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -698,9 +708,9 @@ \setlength\Chs{1\jsZw} \newcommand{\small}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% }{%else - \bxjs@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% }% \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -712,9 +722,9 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% }{%else - \bxjs@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% }% \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@? \abovedisplayshortskip \z@ \@plus2\p@? @@ -724,18 +734,18 @@ \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\bxjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\bxjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\bxjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\bxjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\bxjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\bxjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\bxjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} @@ -754,7 +764,7 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\ifbxjs@mag +\ifjsc@mag \mag=\bxjs@param@mag \fi \setlength{\topskip}{10\p@?} @@ -766,12 +776,12 @@ \def\bxjs@read@d#1\@nil{} \expandafter\bxjs@read@a\bxjs@param@paper\@nil \edef\bxjs@layout@paper{% - \ifbxjs@mag truedimen,\fi + \ifjsc@mag truedimen,\fi \if@landscape landscape,\fi \bxjs@param@paper} \def\bxjs@layout{% - headheight=\topskip,headsep=17.07164\p@?,nofoot,includeheadfoot,% - hmargin=102.42992\p@?,hmarginratio=1:1,% + headheight=\topskip,headsep=6\jsc@mmm,nofoot,includeheadfoot,% + hmargin=36\jsc@mmm,hmarginratio=1:1,% vscale=0.83,vmarginratio=1:1,% } \newdimen\fullwidth @@ -801,9 +811,11 @@ \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% - -\textwidth-1cm-\marginparsep} + -\textwidth-10\jsc@mmm-\marginparsep} \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd \maxdepth=.5\topskip + \stockwidth=\paperwidth + \stockheight=\paperheight } \@onlypreamble\bxjs@revert \let\bxjs@revert\@empty @@ -1267,8 +1279,8 @@ \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% + \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}% \if@twocolumn \@topnewpage[\@makechapterhead{#2}]% \else @@ -1540,12 +1552,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{1} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\jsZw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\jsZw\fi + \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\jsZw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\jsZw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -1582,7 +1594,7 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\jsZw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683\jsZw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty @@ -1590,19 +1602,19 @@ \fi} % \newcommand*{\l@section}{\@dottedtocline{1}{1\jsZw}{3.683\jsZw}} \newcommand*{\l@section}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\jsZw \@dottedtocline{1}{\@tempdima}{3.683\jsZw}} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 2.683\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 2.683\jsZw \@dottedtocline{2}{\@tempdima}{3.5\jsZw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 6.183\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 6.183\jsZw \@dottedtocline{3}{\@tempdima}{4.5\jsZw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 10.683\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 10.683\jsZw \@dottedtocline{4}{\@tempdima}{5.5\jsZw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 16.183\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\jsZw \@dottedtocline{5}{\@tempdima}{6.5\jsZw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} @@ -1710,7 +1722,7 @@ \def\footnotemark{\jsInhibitGlue\footnotemarks@ve} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@? + \kern-2.6\p@? \kern-.4\p@ \hrule width .4\columnwidth \kern 2.6\p@?} \@addtoreset{footnote}{chapter} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 403608ee8ee..ab80d7ef590 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesPackage{bxjscjkcat} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f 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 f6203d5f4e6..a93cd60aa1e 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesPackage{bxjscompat} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f 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 4a925d1c281..7afa137ce83 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-minimal.def} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% @@ -204,6 +204,22 @@ \@tempcnta="80 \@whilenum\@tempcnta<"100 \do{% \xspcode\@tempcnta=3\advance\@tempcnta\@ne} \let\jsInhibitGlueAtParTop\@inhibitglue +\begingroup +\catcode`\!=0 +\gdef\bxjs@ptex@dir{% + !iftdir t% + !else!ifydir y% + !else ?% + !fi!fi} +\long\def\bxjs@tmpa{\hbox{% + !ifydir \@textsuperscript{\normalfont\@thefnmark}% + !else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}!fi}} +\ifx\@makefnmark\bxjs@tmpa +\long\gdef\@makefnmark{% + !ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% + !else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}!fi} +\fi +\endgroup \else\ifx p\jsEngine \let\bxjs@let@hchar@chr\bxjs@let@hchar@chr@ue \@onlypreamble\bxjs@cjk@loaded diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index 0a495baf6d5..9a042527c54 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-modern.def} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f 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 a9d641e5dbb..9a133133808 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-pandoc.def} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f 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 3dd5e2baf04..4bdbeb5336c 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-standard.def} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -44,7 +44,7 @@ \@tempdima=0.25mm \protected\edef\jQ{\dimexpr\the\@tempdima\relax} \let\jH\jQ - \ifbxjs@mag + \ifjsc@mag \@tempdima=2.5mm \@tempdimb=\jsBaseFontSize\relax \edef\bxjs@tmpa{\strip@pt\@tempdimb}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index cc93f0e2fb8..8a1dabd1e85 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -158,6 +158,7 @@ \ClassWarningNoLine\bxjs@clsname {You should not use 'true' lengths here}% \fi} +\newif\ifjsc@mag \DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}} \DeclareOption{9pt}{\bxjs@setbasefontsize{9pt}} \DeclareOption{10pt}{\bxjs@setbasefontsize{10pt}} @@ -177,6 +178,10 @@ \DeclareOption{10.5ptj}{\bxjs@setjbasefontsize{10.5pt}} \DeclareOption{11ptj}{\bxjs@setjbasefontsize{11pt}} \DeclareOption{12ptj}{\bxjs@setjbasefontsize{12pt}} +\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 \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} \DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} \DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse} @@ -391,7 +396,10 @@ \let\bxjs@magstyle@mag=m \let\bxjs@magstyle@real=r \let\bxjs@magstyle@xreal=x -\let\bxjs@magstyle@default\bxjs@magstyle@mag +\let\bxjs@magstyle@usemag\bxjs@magstyle@mag +\let\bxjs@magstyle@nomag\bxjs@magstyle@real +\expandafter\let\csname bxjs@magstyle@nomag*\endcsname\bxjs@magstyle@xreal +\let\bxjs@magstyle@default\bxjs@magstyle@usemag \ifx l\jsEngine \ifnum\luatexversion>86 \let\bxjs@magstyle@default\bxjs@magstyle@xreal \fi\fi @@ -402,7 +410,7 @@ \ifx\bxjs@magstyle\relax \ClassError\bxjs@clsname {Invalid magstyle value `#1'}\@ehc - \let\bxjs@magstyle\bxjs@magstyle@mag + \let\bxjs@magstyle\bxjs@magstyle@default \fi} \let\bxjs@ltx@removeelement\@removeelement \def\@removeelement#1#2#3{% @@ -541,12 +549,12 @@ \def\bxjs@js@clsname{jsbook} \@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)} \fi +\g@addto@macro\@classoptionslist{,nosetpagesize} \ifdim\bxjs@param@basefontsize<10pt \def\n@baseline{15}% \else \def\n@baseline{16}\fi -\newif\ifbxjs@mag \newif\ifbxjs@nfss@patch \ifx\bxjs@magstyle\bxjs@magstyle@mag - \bxjs@magtrue + \jsc@magtrue \else\ifx\bxjs@magstyle\bxjs@magstyle@xreal \bxjs@nfss@patchtrue \fi\fi @@ -568,19 +576,20 @@ \@tempcnta\bxjs@param@mag \advance\@tempcnta100000 \def\bxjs@tmpa#1#2#3#4\@nil{\@tempdima=#2#3.#4\p@} \expandafter\bxjs@tmpa\the\@tempcnta\@nil -\edef\bxjs@real@mag{\strip@pt\@tempdima} +\edef\jsc@magscale{\strip@pt\@tempdima} \let\jsBaseFontSize\bxjs@param@basefontsize -\ifbxjs@mag - \let\bxjs@mpt\p@ +\ifjsc@mag + \let\jsc@mpt\p@ + \newdimen\jsc@mmm \jsc@mmm=1mm \catcode`\?=9 % \p@? read as \p@ \else - \newdimen\bxjs@mpt - \bxjs@mpt=\bxjs@real@mag \p@ - \catcode`\?=11 \let\p@?\bxjs@mpt + \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@ + \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm + \catcode`\?=11 \let\p@?\jsc@mpt \fi \chardef\bxjs@qmcc=\catcode`\?\relax \newdimen\jsZw -\jsZw=10\bxjs@mpt \jsZw=\jsScale\jsZw +\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw \ifbxjs@usezw \providecommand*\zw{\jsZw} \fi @@ -602,7 +611,7 @@ \fi} \def\bxjs@preadjust@extract@font{% \let\bxjs@req@size\f@size - \dimen@\f@size\p@ \bxjs@invscale\dimen@\bxjs@real@mag + \dimen@\f@size\p@ \bxjs@invscale\dimen@\jsc@magscale \advance\dimen@.005pt\relax \bxjs@fstrunc\dimen@ \let\bxjs@ref@size\bxjs@tmpa \let\f@size\bxjs@ref@size} @@ -612,7 +621,7 @@ \csname s@fct@#1\endcsname} \let\bxjs@DeclareErrorFont\DeclareErrorFont \def\DeclareErrorFont#1#2#3#4#5{% - \@tempdimc#5\p@ \@tempdimc\bxjs@real@mag\@tempdimc + \@tempdimc#5\p@ \@tempdimc\jsc@magscale\@tempdimc \edef\bxjs@tmpa{{#1}{#2}{#3}{#4}{\strip@pt\@tempdimc}} \expandafter\bxjs@DeclareErrorFont\bxjs@tmpa} \def\gen@sfcnt{% @@ -625,7 +634,8 @@ \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi \chardef\bxjs@periodchar=`\. -\def\@{\spacefactor\sfcode\bxjs@periodchar} +\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} +\def\@{\bxjs@SE{}} \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -643,11 +653,11 @@ \fi\relax \jsResetDimen} \newcommand*\jsResetDimen{} -\ifbxjs@mag - \let\bxjs@setfontsize\@setfontsize +\ifjsc@mag + \let\jsc@setfontsize\@setfontsize \else - \def\bxjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\bxjs@mpt}{#3\bxjs@mpt}} + \def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \fi \emergencystretch 3\jsZw \newif\ifnarrowbaselines @@ -676,9 +686,9 @@ } \renewcommand{\normalsize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\normalsize\@xpt\@xiipt + \jsc@setfontsize\normalsize\@xpt\@xiipt }{%else - \bxjs@setfontsize\normalsize\@xpt{\n@baseline}% + \jsc@setfontsize\normalsize\@xpt{\n@baseline}% }% \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -698,9 +708,9 @@ \setlength\Chs{1\jsZw} \newcommand{\small}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% }{%else - \bxjs@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% }% \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -712,9 +722,9 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% }{%else - \bxjs@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% }% \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@? \abovedisplayshortskip \z@ \@plus2\p@? @@ -724,18 +734,18 @@ \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\bxjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\bxjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\bxjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\bxjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\bxjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\bxjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\bxjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} @@ -754,7 +764,7 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\ifbxjs@mag +\ifjsc@mag \mag=\bxjs@param@mag \fi \setlength{\topskip}{10\p@?} @@ -766,7 +776,7 @@ \def\bxjs@read@d#1\@nil{} \expandafter\bxjs@read@a\bxjs@param@paper\@nil \edef\bxjs@layout@paper{% - \ifbxjs@mag truedimen,\fi + \ifjsc@mag truedimen,\fi \if@landscape landscape,\fi \bxjs@param@paper} \def\bxjs@layout{% @@ -797,9 +807,11 @@ \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% - -\textwidth-1cm-\marginparsep} + -\textwidth-10\jsc@mmm-\marginparsep} \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd \maxdepth=.5\topskip + \stockwidth=\paperwidth + \stockheight=\paperheight } \@onlypreamble\bxjs@revert \let\bxjs@revert\@empty @@ -1263,8 +1275,8 @@ \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% + \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}% \if@twocolumn \@topnewpage[\@makechapterhead{#2}]% \else @@ -1536,12 +1548,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{1} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\jsZw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\jsZw\fi + \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\jsZw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\jsZw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -1578,7 +1590,7 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\jsZw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683\jsZw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty @@ -1586,19 +1598,19 @@ \fi} % \newcommand*{\l@section}{\@dottedtocline{1}{1\jsZw}{3.683\jsZw}} \newcommand*{\l@section}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\jsZw \@dottedtocline{1}{\@tempdima}{3.683\jsZw}} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 2.683\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 2.683\jsZw \@dottedtocline{2}{\@tempdima}{3.5\jsZw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 6.183\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 6.183\jsZw \@dottedtocline{3}{\@tempdima}{4.5\jsZw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 10.683\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 10.683\jsZw \@dottedtocline{4}{\@tempdima}{5.5\jsZw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 16.183\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\jsZw \@dottedtocline{5}{\@tempdima}{6.5\jsZw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} @@ -1706,7 +1718,7 @@ \def\footnotemark{\jsInhibitGlue\footnotemarks@ve} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@? + \kern-2.6\p@? \kern-.4\p@ \hrule width .4\columnwidth \kern 2.6\p@?} \@addtoreset{footnote}{chapter} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 3ac22811c68..ec1a2b15715 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2016/05/28 v1.1e BXJS document classes] + [2016/07/16 v1.1f BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -156,6 +156,7 @@ \ClassWarningNoLine\bxjs@clsname {You should not use 'true' lengths here}% \fi} +\newif\ifjsc@mag \DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}} \DeclareOption{9pt}{\bxjs@setbasefontsize{9pt}} \DeclareOption{10pt}{\bxjs@setbasefontsize{10pt}} @@ -175,6 +176,10 @@ \DeclareOption{10.5ptj}{\bxjs@setjbasefontsize{10.5pt}} \DeclareOption{11ptj}{\bxjs@setjbasefontsize{11pt}} \DeclareOption{12ptj}{\bxjs@setjbasefontsize{12pt}} +\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 \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} \DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} \DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse} @@ -387,7 +392,10 @@ \let\bxjs@magstyle@mag=m \let\bxjs@magstyle@real=r \let\bxjs@magstyle@xreal=x -\let\bxjs@magstyle@default\bxjs@magstyle@mag +\let\bxjs@magstyle@usemag\bxjs@magstyle@mag +\let\bxjs@magstyle@nomag\bxjs@magstyle@real +\expandafter\let\csname bxjs@magstyle@nomag*\endcsname\bxjs@magstyle@xreal +\let\bxjs@magstyle@default\bxjs@magstyle@usemag \ifx l\jsEngine \ifnum\luatexversion>86 \let\bxjs@magstyle@default\bxjs@magstyle@xreal \fi\fi @@ -398,7 +406,7 @@ \ifx\bxjs@magstyle\relax \ClassError\bxjs@clsname {Invalid magstyle value `#1'}\@ehc - \let\bxjs@magstyle\bxjs@magstyle@mag + \let\bxjs@magstyle\bxjs@magstyle@default \fi} \let\bxjs@ltx@removeelement\@removeelement \def\@removeelement#1#2#3{% @@ -537,11 +545,11 @@ \def\bxjs@js@clsname{jsarticle} \@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)} \fi +\g@addto@macro\@classoptionslist{,nosetpagesize} \def\n@baseline{13}% -\newif\ifbxjs@mag \newif\ifbxjs@nfss@patch \ifx\bxjs@magstyle\bxjs@magstyle@mag - \bxjs@magtrue + \jsc@magtrue \else\ifx\bxjs@magstyle\bxjs@magstyle@xreal \bxjs@nfss@patchtrue \fi\fi @@ -563,19 +571,20 @@ \@tempcnta\bxjs@param@mag \advance\@tempcnta100000 \def\bxjs@tmpa#1#2#3#4\@nil{\@tempdima=#2#3.#4\p@} \expandafter\bxjs@tmpa\the\@tempcnta\@nil -\edef\bxjs@real@mag{\strip@pt\@tempdima} +\edef\jsc@magscale{\strip@pt\@tempdima} \let\jsBaseFontSize\bxjs@param@basefontsize -\ifbxjs@mag - \let\bxjs@mpt\p@ +\ifjsc@mag + \let\jsc@mpt\p@ + \newdimen\jsc@mmm \jsc@mmm=1mm \catcode`\?=9 % \p@? read as \p@ \else - \newdimen\bxjs@mpt - \bxjs@mpt=\bxjs@real@mag \p@ - \catcode`\?=11 \let\p@?\bxjs@mpt + \newdimen\jsc@mpt \jsc@mpt=\jsc@magscale \p@ + \newdimen\jsc@mmm \jsc@mmm=\jsc@magscale mm + \catcode`\?=11 \let\p@?\jsc@mpt \fi \chardef\bxjs@qmcc=\catcode`\?\relax \newdimen\jsZw -\jsZw=10\bxjs@mpt \jsZw=\jsScale\jsZw +\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw \ifbxjs@usezw \providecommand*\zw{\jsZw} \fi @@ -597,7 +606,7 @@ \fi} \def\bxjs@preadjust@extract@font{% \let\bxjs@req@size\f@size - \dimen@\f@size\p@ \bxjs@invscale\dimen@\bxjs@real@mag + \dimen@\f@size\p@ \bxjs@invscale\dimen@\jsc@magscale \advance\dimen@.005pt\relax \bxjs@fstrunc\dimen@ \let\bxjs@ref@size\bxjs@tmpa \let\f@size\bxjs@ref@size} @@ -607,7 +616,7 @@ \csname s@fct@#1\endcsname} \let\bxjs@DeclareErrorFont\DeclareErrorFont \def\DeclareErrorFont#1#2#3#4#5{% - \@tempdimc#5\p@ \@tempdimc\bxjs@real@mag\@tempdimc + \@tempdimc#5\p@ \@tempdimc\jsc@magscale\@tempdimc \edef\bxjs@tmpa{{#1}{#2}{#3}{#4}{\strip@pt\@tempdimc}} \expandafter\bxjs@DeclareErrorFont\bxjs@tmpa} \def\gen@sfcnt{% @@ -620,7 +629,8 @@ \DeclareErrorFont{OT1}{cmr}{m}{n}{10} \fi \chardef\bxjs@periodchar=`\. -\def\@{\spacefactor\sfcode\bxjs@periodchar} +\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} +\def\@{\bxjs@SE{}} \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -638,11 +648,11 @@ \fi\relax \jsResetDimen} \newcommand*\jsResetDimen{} -\ifbxjs@mag - \let\bxjs@setfontsize\@setfontsize +\ifjsc@mag + \let\jsc@setfontsize\@setfontsize \else - \def\bxjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\bxjs@mpt}{#3\bxjs@mpt}} + \def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \fi \emergencystretch 3\jsZw \newif\ifnarrowbaselines @@ -671,9 +681,9 @@ } \renewcommand{\normalsize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\normalsize\@xpt\@xiipt + \jsc@setfontsize\normalsize\@xpt\@xiipt }{%else - \bxjs@setfontsize\normalsize\@xpt{\n@baseline}% + \jsc@setfontsize\normalsize\@xpt{\n@baseline}% }% \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -693,9 +703,9 @@ \setlength\Chs{1\jsZw} \newcommand{\small}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% }{%else - \bxjs@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% }% \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \abovedisplayshortskip \z@ \@plus3\p@? @@ -707,9 +717,9 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \bxjs@if@narrowbaselines{% - \bxjs@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% }{%else - \bxjs@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% }% \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@? \abovedisplayshortskip \z@ \@plus2\p@? @@ -719,18 +729,18 @@ \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\bxjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\bxjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\bxjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\bxjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\bxjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\bxjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\bxjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\bxjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\sffamily} \setlength\columnsep{2\Cwd} @@ -749,7 +759,7 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\ifbxjs@mag +\ifjsc@mag \mag=\bxjs@param@mag \fi \setlength{\topskip}{10\p@?} @@ -761,7 +771,7 @@ \def\bxjs@read@d#1\@nil{} \expandafter\bxjs@read@a\bxjs@param@paper\@nil \edef\bxjs@layout@paper{% - \ifbxjs@mag truedimen,\fi + \ifjsc@mag truedimen,\fi \if@landscape landscape,\fi \bxjs@param@paper} \def\bxjs@layout{% @@ -791,9 +801,11 @@ \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% - -\textwidth-1cm-\marginparsep} + -\textwidth-10\jsc@mmm-\marginparsep} \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd \maxdepth=.5\topskip + \stockwidth=\paperwidth + \stockheight=\paperheight } \@onlypreamble\bxjs@revert \let\bxjs@revert\@empty @@ -1483,12 +1495,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}% + \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\jsZw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\jsZw\fi + \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\jsZw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\jsZw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1517,22 +1529,22 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\jsZw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2\jsZw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\jsZw \@dottedtocline{2}{\@tempdima}{3\jsZw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 0\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 0\jsZw \@dottedtocline{3}{\@tempdima}{4\jsZw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 1\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 1\jsZw \@dottedtocline{4}{\@tempdima}{5\jsZw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 2\jsZw + \@tempdima\jsc@tocl@width \advance\@tempdima 2\jsZw \@dottedtocline{5}{\@tempdima}{6\jsZw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} @@ -1633,7 +1645,7 @@ \def\footnotemark{\jsInhibitGlue\footnotemarks@ve} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@? + \kern-2.6\p@? \kern-.4\p@ \hrule width .4\columnwidth \kern 2.6\p@?} \long\def\@footnotetext{% -- cgit v1.2.3