summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bxjscls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-27 22:17:49 +0000
committerKarl Berry <karl@freefriends.org>2016-03-27 22:17:49 +0000
commit513cfe82c1eaea7d0951e08cbcd92248367567c8 (patch)
tree07ccb6b5aa794a9f53ab7791742ba53287cde9c0 /Master/texmf-dist/tex/latex/bxjscls
parent6338f4358f37f44799d7d3c66d8363b6798043fd (diff)
bxjscls (27mar16)
git-svn-id: svn://tug.org/texlive/trunk@40156 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/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def33
-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.def7
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls30
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls30
10 files changed, 154 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index c7a506a5696..b41c29486d7 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -72,7 +72,10 @@
\fi
\newif\ifjsInPdfMode
\@nameuse{ImposeOldLuaTeXBehavior}
+\let\bxjs@tmpa\PackageWarningNoLine
+\let\PackageWarningNoLine\PackageInfo % suppress warning
\RequirePackage{ifpdf}
+\let\PackageWarningNoLine\bxjs@tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
@@ -320,6 +323,16 @@
\bxjs@disguise@jsfalse}
\DeclareOption{js}{%
\bxjs@disguise@jstrue}
+\newif\ifbxjs@precisetext
+\DeclareOption{noprecisetext}{%
+ \bxjs@precisetextfalse}
+\DeclareOption{precisetext}{%
+ \bxjs@precisetexttrue}
+\newif\ifbxjs@simplejasetup \bxjs@simplejasetuptrue
+\DeclareOption{nosimplejasetup}{%
+ \bxjs@simplejasetupfalse}
+\DeclareOption{simplejasetup}{%
+ \bxjs@simplejasetuptrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
@@ -365,7 +378,11 @@
\let\bxjs@magstyle@mag=m
\let\bxjs@magstyle@real=r
\let\bxjs@magstyle@xreal=x
-\let\bxjs@magstyle\bxjs@magstyle@mag
+\let\bxjs@magstyle@default\bxjs@magstyle@mag
+\ifx l\jsEngine \ifnum\luatexversion>86
+ \let\bxjs@magstyle@default\bxjs@magstyle@xreal
+\fi\fi
+\let\bxjs@magstyle\bxjs@magstyle@default
\define@key{bxjs}{magstyle}{%
\expandafter\let\expandafter\bxjs@magstyle\csname
bxjs@magstyle@#1\endcsname
@@ -483,6 +500,15 @@
{When you employ a Japanese-driver you must specify a
correct\MessageBreak engine option.\MessageBreak\@ehc}
\fi\fi
+\ifx\bxjs@magstyle@default\bxjs@magstyle@mag\else
+ \ifx\bxjs@magstyle\bxjs@magstyle@mag
+ \let\bxjs@magstyle\bxjs@magstyle@default
+ \ClassError\bxjs@clsname%
+ {The engine does not support 'magstyle=mag'}%
+ {LuaTeX v0.87 or later no longer supports "mag" feature.\MessageBreak
+ The default value is used instead.\MessageBreak \@ehc}
+ \fi
+\fi
\bxjs@do@opt@jbase
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 197e99e6fee..5fd19bfae52 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -72,7 +72,10 @@
\fi
\newif\ifjsInPdfMode
\@nameuse{ImposeOldLuaTeXBehavior}
+\let\bxjs@tmpa\PackageWarningNoLine
+\let\PackageWarningNoLine\PackageInfo % suppress warning
\RequirePackage{ifpdf}
+\let\PackageWarningNoLine\bxjs@tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
@@ -324,6 +327,16 @@
\bxjs@disguise@jsfalse}
\DeclareOption{js}{%
\bxjs@disguise@jstrue}
+\newif\ifbxjs@precisetext
+\DeclareOption{noprecisetext}{%
+ \bxjs@precisetextfalse}
+\DeclareOption{precisetext}{%
+ \bxjs@precisetexttrue}
+\newif\ifbxjs@simplejasetup \bxjs@simplejasetuptrue
+\DeclareOption{nosimplejasetup}{%
+ \bxjs@simplejasetupfalse}
+\DeclareOption{simplejasetup}{%
+ \bxjs@simplejasetuptrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
@@ -369,7 +382,11 @@
\let\bxjs@magstyle@mag=m
\let\bxjs@magstyle@real=r
\let\bxjs@magstyle@xreal=x
-\let\bxjs@magstyle\bxjs@magstyle@mag
+\let\bxjs@magstyle@default\bxjs@magstyle@mag
+\ifx l\jsEngine \ifnum\luatexversion>86
+ \let\bxjs@magstyle@default\bxjs@magstyle@xreal
+\fi\fi
+\let\bxjs@magstyle\bxjs@magstyle@default
\define@key{bxjs}{magstyle}{%
\expandafter\let\expandafter\bxjs@magstyle\csname
bxjs@magstyle@#1\endcsname
@@ -487,6 +504,15 @@
{When you employ a Japanese-driver you must specify a
correct\MessageBreak engine option.\MessageBreak\@ehc}
\fi\fi
+\ifx\bxjs@magstyle@default\bxjs@magstyle@mag\else
+ \ifx\bxjs@magstyle\bxjs@magstyle@mag
+ \let\bxjs@magstyle\bxjs@magstyle@default
+ \ClassError\bxjs@clsname%
+ {The engine does not support 'magstyle=mag'}%
+ {LuaTeX v0.87 or later no longer supports "mag" feature.\MessageBreak
+ The default value is used instead.\MessageBreak \@ehc}
+ \fi
+\fi
\bxjs@do@opt@jbase
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index bbbbdfc70f3..192d870206f 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b 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 6673a7f9961..3d020847ed3 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b 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 78964424a6e..053f80a1db7 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
@@ -237,7 +237,38 @@
\def\bxjs@let@hchar@chr@xe#1{%
\lccode`0=`#1\relax
\lowercase{\bxjs@let@hchar@out\def{{0}}}}
+\ifx\XeTeXgenerateactualtext\@undefined\else
+ \def\bxjs@do@precisetext{%
+ \XeTeXgenerateactualtext=\@ne}
+\fi
+\@onlypreamble\bxjs@do@simplejasetup
+\def\bxjs@do@simplejasetup{%
+ \ifnum\XeTeXinterchartokenstate>\z@
+ \else\ifnum\strcmp{\the\XeTeXlinebreakskip}{\the\z@}=\z@
+ \jsSimpleJaSetup
+ \ClassInfo\bxjs@clsname
+ {\string\jsSimpleJaSetup\space is applied\@gobble}%
+ \fi\fi}
+\newcommand*{\jsSimpleJaSetup}{%
+ \XeTeXlinebreaklocale "ja"\relax
+ \XeTeXlinebreakskip=0pt plus 1pt minus 0.1pt\relax
+ \XeTeXlinebreakpenalty=0\relax}
\fi\fi\fi
+\ifx\bxjs@do@simplejasetup\@undefined\else
+ \AtBeginDocument{%
+ \ifbxjs@simplejasetup
+ \bxjs@do@simplejasetup
+ \fi}
+\fi
+\ifbxjs@precisetext
+ \ifx\bxjs@do@precisetext\@undefined
+ \ClassWarning\bxjs@clsname
+ {The current engine does not supprt the\MessageBreak
+ 'precisetext' option\@gobble}
+ \else
+ \bxjs@do@precisetext
+ \fi
+\fi
\endinput
%%
%% End of file `bxjsja-minimal.def'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 1121a109c64..8d8c9b40fdc 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b 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 6177aa0b539..1a68b874668 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b 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 e9694decee5..6ef3f2313f0 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -36,9 +36,10 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\ProvidesFile{bxjsja-standard.def}
- [2016/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
+\bxjs@simplejasetupfalse
\ifjsWitheTeX
\@tempdima=0.25mm
\protected\edef\jQ{\dimexpr\the\@tempdima\relax}
@@ -289,12 +290,15 @@
\bxjs@nxt
\bxjs@cjk@loaded
\PassOptionsToPackage{unicode}{hyperref}
+\ifx\bxcjkjatypeHyperrefPatchDone\@undefined
\begingroup
\CJK@input{UTF8.bdg}
\endgroup
\g@addto@macro\pdfstringdefPreHook{%
\@nameuse{CJK@UTF8Binding}%
}
+\fi
+\ifx\bxcjkjatypeHyperrefPatchDone\@undefined
\g@addto@macro\pdfstringdefPreHook{%
\ifx~\bxjs@@CJKtilde
\let\bxjs@org@LetUnexpandableSpace\HyPsd@LetUnexpandableSpace
@@ -308,6 +312,7 @@
\def\bxjs@tmpa{#1}\ifx\bxjs@tmpa\bxjs@@tildecmd\else
\bxjs@org@LetUnexpandableSpace#1%
\fi}
+\fi
\newskip\jsKanjiSkip
\newskip\jsXKanjiSkip
\ifx\CJKecglue\@undefined
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 857671ab85f..cb16ff2d29f 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -72,7 +72,10 @@
\fi
\newif\ifjsInPdfMode
\@nameuse{ImposeOldLuaTeXBehavior}
+\let\bxjs@tmpa\PackageWarningNoLine
+\let\PackageWarningNoLine\PackageInfo % suppress warning
\RequirePackage{ifpdf}
+\let\PackageWarningNoLine\bxjs@tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
@@ -324,6 +327,16 @@
\bxjs@disguise@jsfalse}
\DeclareOption{js}{%
\bxjs@disguise@jstrue}
+\newif\ifbxjs@precisetext
+\DeclareOption{noprecisetext}{%
+ \bxjs@precisetextfalse}
+\DeclareOption{precisetext}{%
+ \bxjs@precisetexttrue}
+\newif\ifbxjs@simplejasetup \bxjs@simplejasetuptrue
+\DeclareOption{nosimplejasetup}{%
+ \bxjs@simplejasetupfalse}
+\DeclareOption{simplejasetup}{%
+ \bxjs@simplejasetuptrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
@@ -369,7 +382,11 @@
\let\bxjs@magstyle@mag=m
\let\bxjs@magstyle@real=r
\let\bxjs@magstyle@xreal=x
-\let\bxjs@magstyle\bxjs@magstyle@mag
+\let\bxjs@magstyle@default\bxjs@magstyle@mag
+\ifx l\jsEngine \ifnum\luatexversion>86
+ \let\bxjs@magstyle@default\bxjs@magstyle@xreal
+\fi\fi
+\let\bxjs@magstyle\bxjs@magstyle@default
\define@key{bxjs}{magstyle}{%
\expandafter\let\expandafter\bxjs@magstyle\csname
bxjs@magstyle@#1\endcsname
@@ -487,6 +504,15 @@
{When you employ a Japanese-driver you must specify a
correct\MessageBreak engine option.\MessageBreak\@ehc}
\fi\fi
+\ifx\bxjs@magstyle@default\bxjs@magstyle@mag\else
+ \ifx\bxjs@magstyle\bxjs@magstyle@mag
+ \let\bxjs@magstyle\bxjs@magstyle@default
+ \ClassError\bxjs@clsname%
+ {The engine does not support 'magstyle=mag'}%
+ {LuaTeX v0.87 or later no longer supports "mag" feature.\MessageBreak
+ The default value is used instead.\MessageBreak \@ehc}
+ \fi
+\fi
\bxjs@do@opt@jbase
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 696b489399c..92dcfbfc757 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/02/20 v1.1a BXJS document classes]
+ [2016/03/27 v1.1b BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -72,7 +72,10 @@
\fi
\newif\ifjsInPdfMode
\@nameuse{ImposeOldLuaTeXBehavior}
+\let\bxjs@tmpa\PackageWarningNoLine
+\let\PackageWarningNoLine\PackageInfo % suppress warning
\RequirePackage{ifpdf}
+\let\PackageWarningNoLine\bxjs@tmpa
\@nameuse{RevokeOldLuaTeXBehavior}
\let\ifjsInPdfMode\ifpdf
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
@@ -320,6 +323,16 @@
\bxjs@disguise@jsfalse}
\DeclareOption{js}{%
\bxjs@disguise@jstrue}
+\newif\ifbxjs@precisetext
+\DeclareOption{noprecisetext}{%
+ \bxjs@precisetextfalse}
+\DeclareOption{precisetext}{%
+ \bxjs@precisetexttrue}
+\newif\ifbxjs@simplejasetup \bxjs@simplejasetuptrue
+\DeclareOption{nosimplejasetup}{%
+ \bxjs@simplejasetupfalse}
+\DeclareOption{simplejasetup}{%
+ \bxjs@simplejasetuptrue}
\def\bxjs@setkey{%
\expandafter\bxjs@setkey@a\expandafter{\CurrentOption}}
\def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}}
@@ -365,7 +378,11 @@
\let\bxjs@magstyle@mag=m
\let\bxjs@magstyle@real=r
\let\bxjs@magstyle@xreal=x
-\let\bxjs@magstyle\bxjs@magstyle@mag
+\let\bxjs@magstyle@default\bxjs@magstyle@mag
+\ifx l\jsEngine \ifnum\luatexversion>86
+ \let\bxjs@magstyle@default\bxjs@magstyle@xreal
+\fi\fi
+\let\bxjs@magstyle\bxjs@magstyle@default
\define@key{bxjs}{magstyle}{%
\expandafter\let\expandafter\bxjs@magstyle\csname
bxjs@magstyle@#1\endcsname
@@ -483,6 +500,15 @@
{When you employ a Japanese-driver you must specify a
correct\MessageBreak engine option.\MessageBreak\@ehc}
\fi\fi
+\ifx\bxjs@magstyle@default\bxjs@magstyle@mag\else
+ \ifx\bxjs@magstyle\bxjs@magstyle@mag
+ \let\bxjs@magstyle\bxjs@magstyle@default
+ \ClassError\bxjs@clsname%
+ {The engine does not support 'magstyle=mag'}%
+ {LuaTeX v0.87 or later no longer supports "mag" feature.\MessageBreak
+ The default value is used instead.\MessageBreak \@ehc}
+ \fi
+\fi
\bxjs@do@opt@jbase
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}