summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-03 17:27:57 +0000
committerKarl Berry <karl@freefriends.org>2016-05-03 17:27:57 +0000
commitf4550571b29e957d0211b2c6672e2a91cf6b0f5c (patch)
tree216cef8e5798bf101d6094663931dd3a8521359a
parent4602f10ab3b784941be88542b35ea0b62407b37c (diff)
bxjscls (1may16)
git-svn-id: svn://tug.org/texlive/trunk@40865 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README-ja.md2
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README.md1
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdfbin729801 -> 730076 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdfbin953561 -> 918622 bytes
-rw-r--r--Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx11
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls4
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls4
-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.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls4
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls4
16 files changed, 33 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index ee9efe4f800..48d28342923 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
@@ -97,6 +97,8 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使
更新履歴
--------
+ * Version 1.1c 〈2016/05/01〉
+ - バグ修正。
* Version 1.1b 〈2016/03/27〉
- 〈試験的〉`precisetext` オプションを追加。
* Version 1.1a 〈2016/02/20〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index 42bd548fbd9..f24182afe7c 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -87,6 +87,7 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 1.1c 〈2016/05/01〉
* Version 1.1b 〈2016/03/27〉
* Version 1.1a 〈2016/02/20〉
* Version 1.1 〈2016/02/14〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 266bbf8dfcc..b5cfa715d99 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
index aa7566b98df..4ea0de4d5b0 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
@@ -5,8 +5,8 @@
\usepackage{metalogo}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.1b}
-\newcommand{\PkgDate}{2016/03/27}
+\newcommand{\PkgVersion}{1.1c}
+\newcommand{\PkgDate}{2016/05/01}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
index dabe1c8df50..ea204651cab 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index 98208044c8f..f0dd322b5a1 100644
--- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
+++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
@@ -62,7 +62,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2016/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
+% [2016/03/27 v1.1b BXJS document classes]
% [2016/02/20 v1.1a BXJS document classes]
% [2016/02/14 v1.1 BXJS document classes]
% [2015/11/21 v1.0d BXJS document classes]
@@ -2269,6 +2270,8 @@
\newdimen\fullwidth
%<book>\newcommand\jsTextWidthLimit{40}
\def\bxjs@postproc@layout{%
+% ドライバ再設定
+ \let\Gm@driver\bxjs@geometry@driver
% textwidth 調整
\@tempdimb=\textwidth
\if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi
@@ -2387,6 +2390,12 @@
\AtBeginDocument{\ImposeOldLuaTeXBehavior}
\bxjs@nxt \bxjs@revert
\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+% \end{macrocode}
+% |\bxjs@geometry@driver| は |geometry| が用いるドライバの名前。
+% \Note この値は一度決めた後は変わってほしくないので、
+% |\bxjs@postproc@layout| において書き戻す処理を入れている。
+% \begin{macrocode}
+\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index b41c29486d7..6a592e42ed4 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -764,6 +764,7 @@
}
\newdimen\fullwidth
\def\bxjs@postproc@layout{%
+ \let\Gm@driver\bxjs@geometry@driver
\@tempdimb=\textwidth
\if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi
\divide\textwidth\@tempdima \multiply\textwidth\@tempdima
@@ -819,6 +820,7 @@
\AtBeginDocument{\ImposeOldLuaTeXBehavior}
\bxjs@nxt \bxjs@revert
\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\def\setpagelayout{\@ifstar
{\bxjs@reset@layout}{\bxjs@modify@layout}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 5fd19bfae52..9f8d2cd91d4 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -768,6 +768,7 @@
\newdimen\fullwidth
\newcommand\jsTextWidthLimit{40}
\def\bxjs@postproc@layout{%
+ \let\Gm@driver\bxjs@geometry@driver
\@tempdimb=\textwidth
\if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi
\divide\textwidth\@tempdima \multiply\textwidth\@tempdima
@@ -827,6 +828,7 @@
\AtBeginDocument{\ImposeOldLuaTeXBehavior}
\bxjs@nxt \bxjs@revert
\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\def\setpagelayout{\@ifstar
{\bxjs@reset@layout}{\bxjs@modify@layout}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 192d870206f..98650e0d12e 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c 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 3d020847ed3..84447709b31 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c 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 053f80a1db7..90fec99dd96 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c 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 8d8c9b40fdc..71e853022ce 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c 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 1a68b874668..b935ca249e4 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c 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 6ef3f2313f0..2cd4975fe53 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index cb16ff2d29f..ac66b7427a9 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -768,6 +768,7 @@
}
\newdimen\fullwidth
\def\bxjs@postproc@layout{%
+ \let\Gm@driver\bxjs@geometry@driver
\@tempdimb=\textwidth
\if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi
\divide\textwidth\@tempdima \multiply\textwidth\@tempdima
@@ -823,6 +824,7 @@
\AtBeginDocument{\ImposeOldLuaTeXBehavior}
\bxjs@nxt \bxjs@revert
\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\def\setpagelayout{\@ifstar
{\bxjs@reset@layout}{\bxjs@modify@layout}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 92dcfbfc757..35a8c805dc4 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/03/27 v1.1b BXJS document classes]
+ [2016/05/01 v1.1c BXJS document classes]
%% このファイルは日本語文字を含みます
\RequirePackage{calc}
\RequirePackage{keyval}
@@ -762,6 +762,7 @@
}
\newdimen\fullwidth
\def\bxjs@postproc@layout{%
+ \let\Gm@driver\bxjs@geometry@driver
\@tempdimb=\textwidth
\if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi
\divide\textwidth\@tempdima \multiply\textwidth\@tempdima
@@ -817,6 +818,7 @@
\AtBeginDocument{\ImposeOldLuaTeXBehavior}
\bxjs@nxt \bxjs@revert
\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\def\setpagelayout{\@ifstar
{\bxjs@reset@layout}{\bxjs@modify@layout}}