summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bxjscls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-10 22:02:38 +0000
committerKarl Berry <karl@freefriends.org>2017-04-10 22:02:38 +0000
commit47872b2b657010d6a4d584c38a54b31d038b0539 (patch)
tree750a0b6ebe2c7706a2253d25b3e032a6809350da /Master/texmf-dist/tex/latex/bxjscls
parentb22aad90dc8e64704563e9f4582aa48ba0089430 (diff)
bxjscls
git-svn-id: svn://tug.org/texlive/trunk@43741 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls38
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls44
-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.def2
-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.def25
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls44
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls38
10 files changed, 157 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 182179aaaa2..a7624dd6bca 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2017/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -264,16 +264,23 @@
\newif\if@jslogo \@jslogofalse
\DeclareOption{jslogo}{\@jslogotrue}
\DeclareOption{nojslogo}{\@jslogofalse}
-\mathchardef\bxjs@csta=259
+\mathchardef\bxjs@isc@ll=128
+\mathchardef\bxjs@isc@sl=259
+\def\bxjs@isc@sl@h{65539 }
\def\bxjs@invscale#1#2{%
\begingroup \@tempdima=#1\relax \@tempdimb#2\p@\relax
- \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
- \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \ifdim\@tempdima<\bxjs@isc@ll\p@
+ \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
+ \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \else
+ \@tempcnta\@tempdima \divide\@tempcnta\@tempdimb
+ \multiply\@tempcnta\p@ \let\bxjs@isc@sl\bxjs@isc@sl@h
+ \fi
\@tempcntb\p@ \divide\@tempcntb\@tempdimb
\advance\@tempcnta-\@tempcntb \advance\@tempcnta-\tw@
\@tempdimb\@tempcnta\@ne
\advance\@tempcnta\@tempcntb \advance\@tempcnta\@tempcntb
- \advance\@tempcnta\bxjs@csta \@tempdimc\@tempcnta\@ne
+ \advance\@tempcnta\bxjs@isc@sl \@tempdimc\@tempcnta\@ne
\@whiledim\@tempdimb<\@tempdimc\do{%
\@tempcntb\@tempdimb \advance\@tempcntb\@tempdimc
\advance\@tempcntb\@ne \divide\@tempcntb\tw@
@@ -321,9 +328,11 @@
\let\bxjs@driver@@dvipdfmx=1
\let\bxjs@driver@@pdfmode=2
\let\bxjs@driver@@xetex=3
+\let\bxjs@driver@@dvips=4
+\let\bxjs@driver@@none=5
\DeclareOption{dvips}{%
\def\bxjs@driver@opt{dvips}%
- \let\bxjs@driver@given\bxjs@driver@@dvimode}
+ \let\bxjs@driver@given\bxjs@driver@@dvips}
\DeclareOption{dviout}{%
\def\bxjs@driver@opt{dviout}%
\let\bxjs@driver@given\bxjs@driver@@dvimode}
@@ -333,6 +342,9 @@
\DeclareOption{dvipdfmx}{%
\def\bxjs@driver@opt{dvipdfmx}%
\let\bxjs@driver@given\bxjs@driver@@dvipdfmx}
+\DeclareOption{nodvidriver}{%
+ \def\bxjs@driver@opt{nodvidriver}%
+ \let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
\let\bxjs@driver@given\bxjs@driver@@pdfmode}
@@ -467,9 +479,10 @@
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
-\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvips
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\expandafter\let\expandafter\bxjs@tmpa\csname
bxjs@dvidriver@@#1\endcsname
@@ -497,6 +510,10 @@
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
+\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
@@ -615,6 +632,9 @@
\g@addto@macro\@classoptionslist{,dvipdfmx}
\fi\fi
\fi
+\ifx\bxjs@driver@given\bxjs@driver@@none
+ \bxjs@papersizefalse
+\fi
\def\bxjs@@minimal{minimal}
\ifx\bxjs@jadriver\relax
\ifx j\jsEngine
@@ -947,7 +967,9 @@
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
\PassOptionsToPackage{dvipdfm}{geometry}
- \fi
+ \else\ifx\bxjs@driver@given\bxjs@driver@@dvimode
+ \PassOptionsToPackage{dvipdfm}{geometry}
+ \fi\fi
\let\bxPapersizeSpecialDone=t
\else
\PassOptionsToPackage{driver=none}{geometry}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 9bf68abc4cc..6f2b0756d4a 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2017/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -270,16 +270,23 @@
\newif\if@jslogo \@jslogofalse
\DeclareOption{jslogo}{\@jslogotrue}
\DeclareOption{nojslogo}{\@jslogofalse}
-\mathchardef\bxjs@csta=259
+\mathchardef\bxjs@isc@ll=128
+\mathchardef\bxjs@isc@sl=259
+\def\bxjs@isc@sl@h{65539 }
\def\bxjs@invscale#1#2{%
\begingroup \@tempdima=#1\relax \@tempdimb#2\p@\relax
- \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
- \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \ifdim\@tempdima<\bxjs@isc@ll\p@
+ \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
+ \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \else
+ \@tempcnta\@tempdima \divide\@tempcnta\@tempdimb
+ \multiply\@tempcnta\p@ \let\bxjs@isc@sl\bxjs@isc@sl@h
+ \fi
\@tempcntb\p@ \divide\@tempcntb\@tempdimb
\advance\@tempcnta-\@tempcntb \advance\@tempcnta-\tw@
\@tempdimb\@tempcnta\@ne
\advance\@tempcnta\@tempcntb \advance\@tempcnta\@tempcntb
- \advance\@tempcnta\bxjs@csta \@tempdimc\@tempcnta\@ne
+ \advance\@tempcnta\bxjs@isc@sl \@tempdimc\@tempcnta\@ne
\@whiledim\@tempdimb<\@tempdimc\do{%
\@tempcntb\@tempdimb \advance\@tempcntb\@tempdimc
\advance\@tempcntb\@ne \divide\@tempcntb\tw@
@@ -327,9 +334,11 @@
\let\bxjs@driver@@dvipdfmx=1
\let\bxjs@driver@@pdfmode=2
\let\bxjs@driver@@xetex=3
+\let\bxjs@driver@@dvips=4
+\let\bxjs@driver@@none=5
\DeclareOption{dvips}{%
\def\bxjs@driver@opt{dvips}%
- \let\bxjs@driver@given\bxjs@driver@@dvimode}
+ \let\bxjs@driver@given\bxjs@driver@@dvips}
\DeclareOption{dviout}{%
\def\bxjs@driver@opt{dviout}%
\let\bxjs@driver@given\bxjs@driver@@dvimode}
@@ -339,6 +348,9 @@
\DeclareOption{dvipdfmx}{%
\def\bxjs@driver@opt{dvipdfmx}%
\let\bxjs@driver@given\bxjs@driver@@dvipdfmx}
+\DeclareOption{nodvidriver}{%
+ \def\bxjs@driver@opt{nodvidriver}%
+ \let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
\let\bxjs@driver@given\bxjs@driver@@pdfmode}
@@ -473,9 +485,10 @@
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
-\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvips
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\expandafter\let\expandafter\bxjs@tmpa\csname
bxjs@dvidriver@@#1\endcsname
@@ -506,6 +519,10 @@
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
+\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
@@ -624,6 +641,9 @@
\g@addto@macro\@classoptionslist{,dvipdfmx}
\fi\fi
\fi
+\ifx\bxjs@driver@given\bxjs@driver@@none
+ \bxjs@papersizefalse
+\fi
\def\bxjs@@minimal{minimal}
\ifx\bxjs@jadriver\relax
\ifx j\jsEngine
@@ -973,7 +993,9 @@
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
\PassOptionsToPackage{dvipdfm}{geometry}
- \fi
+ \else\ifx\bxjs@driver@given\bxjs@driver@@dvimode
+ \PassOptionsToPackage{dvipdfm}{geometry}
+ \fi\fi
\let\bxPapersizeSpecialDone=t
\else
\PassOptionsToPackage{driver=none}{geometry}
@@ -1090,16 +1112,18 @@
\def\@oddhead{%
\hbox to \fullwidth{\hfil\textbf{\thepage}}\hss}}
\let\ps@plain\ps@plainhead
+\def\bxjs@maybe@autoxspacing{%
+ \ifx\autoxspacing\@undefined\else \autoxspacing \fi}
\newif\if@omit@number
\def\ps@headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
\def\@evenhead{%
\if@mparswitch \hss \fi
- \underline{\hbox to \fullwidth{\autoxspacing
+ \underline{\hbox to \fullwidth{\bxjs@maybe@autoxspacing
\textbf{\thepage}\hfil\leftmark}}%
\if@mparswitch\else \hss \fi}%
- \def\@oddhead{\underline{\hbox to \fullwidth{\autoxspacing
+ \def\@oddhead{\underline{\hbox to \fullwidth{\bxjs@maybe@autoxspacing
{\if@twoside\rightmark\else\leftmark\fi}\hfil\textbf{\thepage}}}\hss}%
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index a0d8f3808c8..a0e060d4854 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b 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 89dbd9d81ad..1e939d70e67 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b 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 9103eac733f..f54aaf76148 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b 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
index f812ef2cd1f..1021409e2d9 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b 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 092a1954fa2..fead351d685 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b 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 823e534d947..44ec5bc312d 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/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -218,6 +218,15 @@
\bxUInt{\@tempcnta}%
\fi}
\fi
+\ifbxjs@xkanjiskip@cmd
+ \def\bxjs@put@xkanjiskip{%
+ \relax\ifmmode \mskip\medmuskip
+ \else \hskip\xkanjiskip
+ \fi}
+ \ifjsWitheTeX \protected\def\>{\bxjs@put@xkanjiskip}
+ \else \def\>{\protect\bxjs@put@xkanjiskip}
+ \fi
+\fi
\let\bxjs@tmpa\jsJaFont
\ifx\bxjs@tmpa\bxjs@@auto
\let\bxjs@tmpa\@empty
@@ -346,6 +355,10 @@
\let\CJKecglue\bxjs@CJKecglue}
\def\bxjs@jachar#1{%
\CJKforced{#1}}
+\ifbxjs@xkanjiskip@cmd
+ \protected\def\>{%
+ \relax\ifmmode \mskip\medmuskip \else \CJKecglue\ignorespaces \fi}
+\fi
\ifx t\bxjs@enablejfam
\ClassWarningNoLine\bxjs@clsname
{You cannot use 'enablejfam=true', since the\MessageBreak
@@ -400,6 +413,10 @@
\def\bxjs@jachar#1{%
\xeCJKDeclareCharClass{CJK}{`#1}\relax
#1}
+\ifbxjs@xkanjiskip@cmd
+ \protected\def\>{%
+ \relax\ifmmode \mskip\medmuskip \else \CJKecglue\ignorespaces \fi}
+\fi
\ifx t\bxjs@enablejfam
\@enablejfamtrue
\fi
@@ -468,6 +485,12 @@
\ltjsetparameter{xkanjiskip={\@tempskipa}}}
\def\bxjs@jachar#1{%
\ltjjachar`#1\relax}
+\ifbxjs@xkanjiskip@cmd
+ \protected\def\>{%
+ \relax\ifmmode \mskip\medmuskip
+ \else \hskip\ltjgetparameter{xkanjiskip}\ignorespaces
+ \fi}
+\fi
\ifx f\bxjs@enablejfam
\ClassWarningNoLine\bxjs@clsname
{You cannot use 'enablejfam=false', since the\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index c429fa85b6a..edaf2987ca6 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2017/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -270,16 +270,23 @@
\newif\if@jslogo \@jslogofalse
\DeclareOption{jslogo}{\@jslogotrue}
\DeclareOption{nojslogo}{\@jslogofalse}
-\mathchardef\bxjs@csta=259
+\mathchardef\bxjs@isc@ll=128
+\mathchardef\bxjs@isc@sl=259
+\def\bxjs@isc@sl@h{65539 }
\def\bxjs@invscale#1#2{%
\begingroup \@tempdima=#1\relax \@tempdimb#2\p@\relax
- \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
- \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \ifdim\@tempdima<\bxjs@isc@ll\p@
+ \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
+ \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \else
+ \@tempcnta\@tempdima \divide\@tempcnta\@tempdimb
+ \multiply\@tempcnta\p@ \let\bxjs@isc@sl\bxjs@isc@sl@h
+ \fi
\@tempcntb\p@ \divide\@tempcntb\@tempdimb
\advance\@tempcnta-\@tempcntb \advance\@tempcnta-\tw@
\@tempdimb\@tempcnta\@ne
\advance\@tempcnta\@tempcntb \advance\@tempcnta\@tempcntb
- \advance\@tempcnta\bxjs@csta \@tempdimc\@tempcnta\@ne
+ \advance\@tempcnta\bxjs@isc@sl \@tempdimc\@tempcnta\@ne
\@whiledim\@tempdimb<\@tempdimc\do{%
\@tempcntb\@tempdimb \advance\@tempcntb\@tempdimc
\advance\@tempcntb\@ne \divide\@tempcntb\tw@
@@ -327,9 +334,11 @@
\let\bxjs@driver@@dvipdfmx=1
\let\bxjs@driver@@pdfmode=2
\let\bxjs@driver@@xetex=3
+\let\bxjs@driver@@dvips=4
+\let\bxjs@driver@@none=5
\DeclareOption{dvips}{%
\def\bxjs@driver@opt{dvips}%
- \let\bxjs@driver@given\bxjs@driver@@dvimode}
+ \let\bxjs@driver@given\bxjs@driver@@dvips}
\DeclareOption{dviout}{%
\def\bxjs@driver@opt{dviout}%
\let\bxjs@driver@given\bxjs@driver@@dvimode}
@@ -339,6 +348,9 @@
\DeclareOption{dvipdfmx}{%
\def\bxjs@driver@opt{dvipdfmx}%
\let\bxjs@driver@given\bxjs@driver@@dvipdfmx}
+\DeclareOption{nodvidriver}{%
+ \def\bxjs@driver@opt{nodvidriver}%
+ \let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
\let\bxjs@driver@given\bxjs@driver@@pdfmode}
@@ -473,9 +485,10 @@
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
-\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvips
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\expandafter\let\expandafter\bxjs@tmpa\csname
bxjs@dvidriver@@#1\endcsname
@@ -506,6 +519,10 @@
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
+\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
@@ -624,6 +641,9 @@
\g@addto@macro\@classoptionslist{,dvipdfmx}
\fi\fi
\fi
+\ifx\bxjs@driver@given\bxjs@driver@@none
+ \bxjs@papersizefalse
+\fi
\def\bxjs@@minimal{minimal}
\ifx\bxjs@jadriver\relax
\ifx j\jsEngine
@@ -956,7 +976,9 @@
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
\PassOptionsToPackage{dvipdfm}{geometry}
- \fi
+ \else\ifx\bxjs@driver@given\bxjs@driver@@dvimode
+ \PassOptionsToPackage{dvipdfm}{geometry}
+ \fi\fi
\let\bxPapersizeSpecialDone=t
\else
\PassOptionsToPackage{driver=none}{geometry}
@@ -1073,16 +1095,18 @@
\def\@oddhead{%
\hbox to \fullwidth{\hfil\textbf{\thepage}}\hss}}
\let\ps@plain\ps@plainfoot
+\def\bxjs@maybe@autoxspacing{%
+ \ifx\autoxspacing\@undefined\else \autoxspacing \fi}
\newif\if@omit@number
\def\ps@headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
\def\@evenhead{%
\if@mparswitch \hss \fi
- \underline{\hbox to \fullwidth{\autoxspacing
+ \underline{\hbox to \fullwidth{\bxjs@maybe@autoxspacing
\textbf{\thepage}\hfil\leftmark}}%
\if@mparswitch\else \hss \fi}%
- \def\@oddhead{\underline{\hbox to \fullwidth{\autoxspacing
+ \def\@oddhead{\underline{\hbox to \fullwidth{\bxjs@maybe@autoxspacing
{\if@twoside\rightmark\else\leftmark\fi}\hfil\textbf{\thepage}}}\hss}%
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 14b1d291068..384f9fe2dde 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2017/03/14 v1.5a BXJS document classes]
+ [2017/04/01 v1.5b BXJS document classes]
%% このファイルは日本語文字を含みます.
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -264,16 +264,23 @@
\newif\if@jslogo \@jslogofalse
\DeclareOption{jslogo}{\@jslogotrue}
\DeclareOption{nojslogo}{\@jslogofalse}
-\mathchardef\bxjs@csta=259
+\mathchardef\bxjs@isc@ll=128
+\mathchardef\bxjs@isc@sl=259
+\def\bxjs@isc@sl@h{65539 }
\def\bxjs@invscale#1#2{%
\begingroup \@tempdima=#1\relax \@tempdimb#2\p@\relax
- \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
- \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \ifdim\@tempdima<\bxjs@isc@ll\p@
+ \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
+ \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \else
+ \@tempcnta\@tempdima \divide\@tempcnta\@tempdimb
+ \multiply\@tempcnta\p@ \let\bxjs@isc@sl\bxjs@isc@sl@h
+ \fi
\@tempcntb\p@ \divide\@tempcntb\@tempdimb
\advance\@tempcnta-\@tempcntb \advance\@tempcnta-\tw@
\@tempdimb\@tempcnta\@ne
\advance\@tempcnta\@tempcntb \advance\@tempcnta\@tempcntb
- \advance\@tempcnta\bxjs@csta \@tempdimc\@tempcnta\@ne
+ \advance\@tempcnta\bxjs@isc@sl \@tempdimc\@tempcnta\@ne
\@whiledim\@tempdimb<\@tempdimc\do{%
\@tempcntb\@tempdimb \advance\@tempcntb\@tempdimc
\advance\@tempcntb\@ne \divide\@tempcntb\tw@
@@ -321,9 +328,11 @@
\let\bxjs@driver@@dvipdfmx=1
\let\bxjs@driver@@pdfmode=2
\let\bxjs@driver@@xetex=3
+\let\bxjs@driver@@dvips=4
+\let\bxjs@driver@@none=5
\DeclareOption{dvips}{%
\def\bxjs@driver@opt{dvips}%
- \let\bxjs@driver@given\bxjs@driver@@dvimode}
+ \let\bxjs@driver@given\bxjs@driver@@dvips}
\DeclareOption{dviout}{%
\def\bxjs@driver@opt{dviout}%
\let\bxjs@driver@given\bxjs@driver@@dvimode}
@@ -333,6 +342,9 @@
\DeclareOption{dvipdfmx}{%
\def\bxjs@driver@opt{dvipdfmx}%
\let\bxjs@driver@given\bxjs@driver@@dvipdfmx}
+\DeclareOption{nodvidriver}{%
+ \def\bxjs@driver@opt{nodvidriver}%
+ \let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
\let\bxjs@driver@given\bxjs@driver@@pdfmode}
@@ -467,9 +479,10 @@
\bxjs@set@keyval{fancyhdr}{#1}{}}
\newif\ifbxjs@dvi@opt
\let\bxjs@dvidriver@@dvipdfmx=\bxjs@driver@@dvipdfmx
-\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@dvips=\bxjs@driver@@dvips
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
+\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\expandafter\let\expandafter\bxjs@tmpa\csname
bxjs@dvidriver@@#1\endcsname
@@ -497,6 +510,10 @@
\let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
\let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
\define@key{bxjs}{whole-zw-lines}{\bxjs@set@keyval{wholezwlines}{#1}{}}
+\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
+\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
+\define@key{bxjs}{xkanjiskip-cmd}{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
\newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
\let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
@@ -615,6 +632,9 @@
\g@addto@macro\@classoptionslist{,dvipdfmx}
\fi\fi
\fi
+\ifx\bxjs@driver@given\bxjs@driver@@none
+ \bxjs@papersizefalse
+\fi
\def\bxjs@@minimal{minimal}
\ifx\bxjs@jadriver\relax
\ifx j\jsEngine
@@ -945,7 +965,9 @@
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
\PassOptionsToPackage{dvipdfm}{geometry}
- \fi
+ \else\ifx\bxjs@driver@given\bxjs@driver@@dvimode
+ \PassOptionsToPackage{dvipdfm}{geometry}
+ \fi\fi
\let\bxPapersizeSpecialDone=t
\else
\PassOptionsToPackage{driver=none}{geometry}