summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bxjscls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-08 21:25:44 +0000
committerKarl Berry <karl@freefriends.org>2015-09-08 21:25:44 +0000
commit34722e1da36fa4241609e892451a3bf9af62db35 (patch)
tree2435be1ed5ce3a76172840067abe312044cc503f /Master/texmf-dist/tex/latex/bxjscls
parent97799cd5e5b38f759c71d82eec31f6e08b615945 (diff)
bxjscls (8sep15)
git-svn-id: svn://tug.org/texlive/trunk@38324 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls30
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls30
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def6
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls30
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls30
6 files changed, 98 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 001b6957c3b..af37716f58e 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
\RequirePackage{calc}
\RequirePackage{keyval}
\let\jsEngine=n
@@ -304,8 +304,14 @@
\bxjs@disguise@jstrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
-\def\bxjs@setkey@a{\setkeys{bxjs}}
+\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
\DeclareOption*{\bxjs@setkey}
+\def\bxjs@safe@setkeys#1#2{%
+ \let\bxjs@KV@errx\KV@errx
+ \let\KV@errx\bxjs@safe@setkeys@a
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@KV@errx}
+\def\bxjs@safe@setkeys@a#1{}
\newif\ifbxjs@scaleset
\def\jsScale{0.924715}
\def\Cjascale{\jsScale}
@@ -349,11 +355,11 @@
{Invalid magstyle value `#1'}\@ehc
\let\bxjs@magstyle\bxjs@magstyle@mag
\fi}
-\let\ltx@removeelement\@removeelement
+\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
- \else \ltx@removeelement{#1}{#2}{#3}%
+ \else \bxjs@ltx@removeelement{#1}{#2}{#3}%
\fi}
\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
\ProcessOptions\relax
@@ -361,6 +367,9 @@
{papersize}\@classoptionslist\@classoptionslist
\@expandtwoargs\@removeelement
{10pt}\@classoptionslist\@classoptionslist
+\ifx\bxjs@jadriver\relax\else
+ \let\bxjs@jadriver@given\bxjs@jadriver
+\fi
\let\bxjs@tmpb\jsEngine
\ifx j\bxjs@tmpb\ifjsWithupTeX
\let\bxjs@tmpb=u
@@ -401,8 +410,9 @@
\fi
\ifjsInPdfMode \@tempswafalse
\else\ifx x\jsEngine \@tempswafalse
+\else\ifx\bxjs@jadriver@given\@undefined \@tempswafalse
\else \@tempswatrue
-\fi\fi
+\fi\fi\fi
\if@tempswa
\ifx\bxjs@driver@opt\@undefined
\ClassWarningNoLine\bxjs@clsname
@@ -423,7 +433,7 @@
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
-\ifx\bxjs@jadriver\bxjs@@minimal\else
+\ifx\bxjs@jadriver@given\@undefined\else
\ifx\bxjs@engine@given\@undefined
\ClassError\bxjs@clsname%
{An engine option must be explicitly given}%
@@ -568,7 +578,10 @@
\skip2=\abovedisplayshortskip
\skip4=\belowdisplayskip
\skip6=\belowdisplayshortskip
+ \let\bxjs@ltx@nomath\@nomath
+ \let\@nomath\@gobble
\@currsize\selectfont
+ \let\@nomath\bxjs@ltx@nomath
\abovedisplayskip=\skip0
\abovedisplayshortskip=\skip2
\belowdisplayskip=\skip4
@@ -1193,8 +1206,11 @@
\renewcommand{\theenumii}{\@alph\c@enumii}
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
+\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
+\newcommand*{\jsInJaParen}[1]{%
+ \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInhibitGlue(\theenumii)\jsInhibitGlue}
+\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 8b52df4ffdb..e524370fe84 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
\RequirePackage{calc}
\RequirePackage{keyval}
\let\jsEngine=n
@@ -308,8 +308,14 @@
\bxjs@disguise@jstrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
-\def\bxjs@setkey@a{\setkeys{bxjs}}
+\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
\DeclareOption*{\bxjs@setkey}
+\def\bxjs@safe@setkeys#1#2{%
+ \let\bxjs@KV@errx\KV@errx
+ \let\KV@errx\bxjs@safe@setkeys@a
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@KV@errx}
+\def\bxjs@safe@setkeys@a#1{}
\newif\ifbxjs@scaleset
\def\jsScale{0.924715}
\def\Cjascale{\jsScale}
@@ -353,11 +359,11 @@
{Invalid magstyle value `#1'}\@ehc
\let\bxjs@magstyle\bxjs@magstyle@mag
\fi}
-\let\ltx@removeelement\@removeelement
+\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
- \else \ltx@removeelement{#1}{#2}{#3}%
+ \else \bxjs@ltx@removeelement{#1}{#2}{#3}%
\fi}
\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
\ProcessOptions\relax
@@ -365,6 +371,9 @@
{papersize}\@classoptionslist\@classoptionslist
\@expandtwoargs\@removeelement
{10pt}\@classoptionslist\@classoptionslist
+\ifx\bxjs@jadriver\relax\else
+ \let\bxjs@jadriver@given\bxjs@jadriver
+\fi
\let\bxjs@tmpb\jsEngine
\ifx j\bxjs@tmpb\ifjsWithupTeX
\let\bxjs@tmpb=u
@@ -405,8 +414,9 @@
\fi
\ifjsInPdfMode \@tempswafalse
\else\ifx x\jsEngine \@tempswafalse
+\else\ifx\bxjs@jadriver@given\@undefined \@tempswafalse
\else \@tempswatrue
-\fi\fi
+\fi\fi\fi
\if@tempswa
\ifx\bxjs@driver@opt\@undefined
\ClassWarningNoLine\bxjs@clsname
@@ -427,7 +437,7 @@
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
-\ifx\bxjs@jadriver\bxjs@@minimal\else
+\ifx\bxjs@jadriver@given\@undefined\else
\ifx\bxjs@engine@given\@undefined
\ClassError\bxjs@clsname%
{An engine option must be explicitly given}%
@@ -572,7 +582,10 @@
\skip2=\abovedisplayshortskip
\skip4=\belowdisplayskip
\skip6=\belowdisplayshortskip
+ \let\bxjs@ltx@nomath\@nomath
+ \let\@nomath\@gobble
\@currsize\selectfont
+ \let\@nomath\bxjs@ltx@nomath
\abovedisplayskip=\skip0
\abovedisplayshortskip=\skip2
\belowdisplayskip=\skip4
@@ -1286,8 +1299,11 @@
\renewcommand{\theenumii}{\@alph\c@enumii}
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
+\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
+\newcommand*{\jsInJaParen}[1]{%
+ \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInhibitGlue(\theenumii)\jsInhibitGlue}
+\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 8fb926cbd26..14b0afb0539 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index b5feee63779..5b7bc161f36 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
\input{bxjsja-minimal.def}
\ifjsWitheTeX
\@tempdima=0.25mm
@@ -287,6 +287,8 @@
\else\if x\jsEngine
\RequirePackage{zxjatype}
\PassOptionsToPackage{no-math}{fontspec}%!
+\PassOptionsToPackage{xetex}{graphicx}%!
+\PassOptionsToPackage{xetex}{graphics}%!
\ifx\zxJaFamilyName\@undefined
\ClassError\bxjs@clsname
{xeCJK or zxjatype is too old}\@ehc
@@ -327,6 +329,8 @@
\let\zw\@undefined
\RequirePackage{luatexja}
\RequirePackage{luatexja-fontspec}
+\PassOptionsToPackage{pdftex}{graphicx}%!
+\PassOptionsToPackage{pdftex}{graphics}%!
\ExplSyntaxOn
\fp_gset:Nn \g_ltj_fontspec_scale_fp { \jsScale }
\ExplSyntaxOff
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 3872521f02d..e7471f4f192 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
\RequirePackage{calc}
\RequirePackage{keyval}
\let\jsEngine=n
@@ -308,8 +308,14 @@
\bxjs@disguise@jstrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
-\def\bxjs@setkey@a{\setkeys{bxjs}}
+\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
\DeclareOption*{\bxjs@setkey}
+\def\bxjs@safe@setkeys#1#2{%
+ \let\bxjs@KV@errx\KV@errx
+ \let\KV@errx\bxjs@safe@setkeys@a
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@KV@errx}
+\def\bxjs@safe@setkeys@a#1{}
\newif\ifbxjs@scaleset
\def\jsScale{0.924715}
\def\Cjascale{\jsScale}
@@ -353,11 +359,11 @@
{Invalid magstyle value `#1'}\@ehc
\let\bxjs@magstyle\bxjs@magstyle@mag
\fi}
-\let\ltx@removeelement\@removeelement
+\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
- \else \ltx@removeelement{#1}{#2}{#3}%
+ \else \bxjs@ltx@removeelement{#1}{#2}{#3}%
\fi}
\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
\ProcessOptions\relax
@@ -365,6 +371,9 @@
{papersize}\@classoptionslist\@classoptionslist
\@expandtwoargs\@removeelement
{10pt}\@classoptionslist\@classoptionslist
+\ifx\bxjs@jadriver\relax\else
+ \let\bxjs@jadriver@given\bxjs@jadriver
+\fi
\let\bxjs@tmpb\jsEngine
\ifx j\bxjs@tmpb\ifjsWithupTeX
\let\bxjs@tmpb=u
@@ -405,8 +414,9 @@
\fi
\ifjsInPdfMode \@tempswafalse
\else\ifx x\jsEngine \@tempswafalse
+\else\ifx\bxjs@jadriver@given\@undefined \@tempswafalse
\else \@tempswatrue
-\fi\fi
+\fi\fi\fi
\if@tempswa
\ifx\bxjs@driver@opt\@undefined
\ClassWarningNoLine\bxjs@clsname
@@ -427,7 +437,7 @@
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
-\ifx\bxjs@jadriver\bxjs@@minimal\else
+\ifx\bxjs@jadriver@given\@undefined\else
\ifx\bxjs@engine@given\@undefined
\ClassError\bxjs@clsname%
{An engine option must be explicitly given}%
@@ -572,7 +582,10 @@
\skip2=\abovedisplayshortskip
\skip4=\belowdisplayskip
\skip6=\belowdisplayshortskip
+ \let\bxjs@ltx@nomath\@nomath
+ \let\@nomath\@gobble
\@currsize\selectfont
+ \let\@nomath\bxjs@ltx@nomath
\abovedisplayskip=\skip0
\abovedisplayshortskip=\skip2
\belowdisplayskip=\skip4
@@ -1282,8 +1295,11 @@
\renewcommand{\theenumii}{\@alph\c@enumii}
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
+\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
+\newcommand*{\jsInJaParen}[1]{%
+ \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInhibitGlue(\theenumii)\jsInhibitGlue}
+\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 36fe243321c..60068d215c5 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}
- [2015/08/23 v1.0a BXJS document classes]
+ [2015/09/07 v1.0b BXJS document classes]
\RequirePackage{calc}
\RequirePackage{keyval}
\let\jsEngine=n
@@ -304,8 +304,14 @@
\bxjs@disguise@jstrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
-\def\bxjs@setkey@a{\setkeys{bxjs}}
+\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
\DeclareOption*{\bxjs@setkey}
+\def\bxjs@safe@setkeys#1#2{%
+ \let\bxjs@KV@errx\KV@errx
+ \let\KV@errx\bxjs@safe@setkeys@a
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@KV@errx}
+\def\bxjs@safe@setkeys@a#1{}
\newif\ifbxjs@scaleset
\def\jsScale{0.924715}
\def\Cjascale{\jsScale}
@@ -349,11 +355,11 @@
{Invalid magstyle value `#1'}\@ehc
\let\bxjs@magstyle\bxjs@magstyle@mag
\fi}
-\let\ltx@removeelement\@removeelement
+\let\bxjs@ltx@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
- \else \ltx@removeelement{#1}{#2}{#3}%
+ \else \bxjs@ltx@removeelement{#1}{#2}{#3}%
\fi}
\ExecuteOptions{36pt,a4paper,landscape,oneside,onecolumn,titlepage,final}
\ProcessOptions\relax
@@ -361,6 +367,9 @@
{papersize}\@classoptionslist\@classoptionslist
\@expandtwoargs\@removeelement
{10pt}\@classoptionslist\@classoptionslist
+\ifx\bxjs@jadriver\relax\else
+ \let\bxjs@jadriver@given\bxjs@jadriver
+\fi
\let\bxjs@tmpb\jsEngine
\ifx j\bxjs@tmpb\ifjsWithupTeX
\let\bxjs@tmpb=u
@@ -401,8 +410,9 @@
\fi
\ifjsInPdfMode \@tempswafalse
\else\ifx x\jsEngine \@tempswafalse
+\else\ifx\bxjs@jadriver@given\@undefined \@tempswafalse
\else \@tempswatrue
-\fi\fi
+\fi\fi\fi
\if@tempswa
\ifx\bxjs@driver@opt\@undefined
\ClassWarningNoLine\bxjs@clsname
@@ -423,7 +433,7 @@
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
-\ifx\bxjs@jadriver\bxjs@@minimal\else
+\ifx\bxjs@jadriver@given\@undefined\else
\ifx\bxjs@engine@given\@undefined
\ClassError\bxjs@clsname%
{An engine option must be explicitly given}%
@@ -567,7 +577,10 @@
\skip2=\abovedisplayshortskip
\skip4=\belowdisplayskip
\skip6=\belowdisplayshortskip
+ \let\bxjs@ltx@nomath\@nomath
+ \let\@nomath\@gobble
\@currsize\selectfont
+ \let\@nomath\bxjs@ltx@nomath
\abovedisplayskip=\skip0
\abovedisplayshortskip=\skip2
\belowdisplayskip=\skip4
@@ -1191,8 +1204,11 @@
\renewcommand{\theenumii}{\@alph\c@enumii}
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
+\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
+\newcommand*{\jsInJaParen}[1]{%
+ \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInhibitGlue(\theenumii)\jsInhibitGlue}
+\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}