diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-11 23:08:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-11 23:08:46 +0000 |
commit | 31fa4a2461c0ff5efe56ef940af61052b14874ef (patch) | |
tree | 3fe6981d30ae8b791d6c84b1c2203ce0b3989965 /Master/texmf-dist/tex/latex | |
parent | b5e666f616a45300c2cfe93175f3f02b94ed3f70 (diff) |
bxjscls (11mar17)
git-svn-id: svn://tug.org/texlive/trunk@43467 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
10 files changed, 288 insertions, 137 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 19de99c4701..4eb2053daf7 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -481,11 +481,12 @@ \let\bxjs@driver@given\@undefined \bxjs@dvi@opttrue \fi} -\newif\ifbxjs@layout@buggyhmargin \bxjs@layout@buggyhmarginfalse +\newif\ifbxjs@layout@buggyhmargin +\newif\ifbxjs@force@chapterabstract \@namedef{bxjs@kv@layout@v1}{% - \bxjs@layout@buggyhmargintrue} +} \@namedef{bxjs@kv@layout@v2}{% - \bxjs@layout@buggyhmarginfalse} +} \define@key{bxjs}{layout}{% \bxjs@set@keyval{layout}{#1}{}} \define@key{bxjs}{textwidth-limit}{% @@ -496,10 +497,6 @@ \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@dummy@microtype \bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@true\bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@false\bxjs@dummy@microtypefalse -\define@key{bxjs}{dummy-microtype}{\bxjs@set@keyval{dummymicrotype}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -910,12 +907,14 @@ \ifx\bxjs@geometry@driver\relax\else \let\Gm@driver\bxjs@geometry@driver \fi - \@tempdimb=\textwidth - \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi - \divide\textwidth\@tempdima \multiply\textwidth\@tempdima - \advance\@tempdimb-\textwidth - \advance\oddsidemargin 0.5\@tempdimb - \advance\evensidemargin 0.5\@tempdimb + \ifbxjs@whole@zw@lines + \@tempdimb=\textwidth + \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi + \divide\textwidth\@tempdima \multiply\textwidth\@tempdima + \advance\@tempdimb-\textwidth + \advance\oddsidemargin 0.5\@tempdimb + \advance\evensidemargin 0.5\@tempdimb + \fi \fullwidth=\textwidth \@tempdimb=\textheight \advance\textheight-\topskip @@ -930,7 +929,9 @@ \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% -\textwidth-10\jsc@mmm-\marginparsep} - \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \ifbxjs@whole@zw@lines + \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \fi \maxdepth=.5\topskip \stockwidth=\paperwidth \stockheight=\paperheight @@ -1029,6 +1030,18 @@ \setlength\@dblfptop{0\p@? \@plus 1fil} \setlength\@dblfpsep{8\p@? \@plus 2fil} \setlength\@dblfpbot{0\p@? \@plus 1fil} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\let\pltx@cleartorightpage\pltx@cleartooddpage +\let\pltx@cleartoleftpage\pltx@cleartoevenpage \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -1412,9 +1425,11 @@ {\normalfont\normalsize\headfont}} \fi \newcommand\jsParagraphMark{\jsJaChar{■}} -\ifx\bxjs@paragraph@mark\@undefined\else +\ifx\bxjs@paragraph@mark\@empty + \let\jsParagraphMark\@empty +\else\ifx\bxjs@paragraph@mark\@undefined\else \long\edef\jsParagraphMark{\noexpand\jsJaChar{\bxjs@paragraph@mark}} -\fi +\fi\fi \let\jsJaChar\@empty \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% @@ -1523,7 +1538,8 @@ \begin{center}% \headfont \abstractname \@endparpenalty\@M - \end{center}}% + \end{center}% + \par}% {\par\vfil\null\endtitlepage} \else \newenvironment{abstract}{% @@ -1590,7 +1606,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017-02-24 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -1931,8 +1947,8 @@ \def\@@inhibitglue{% \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} \expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% - \def\bxjs@ig@temp{#1}% - \ifx\bxjs@ig@temp\@empty + \def\jsc@ig@temp{#1}% + \ifx\jsc@ig@temp\@empty \ifnum\the\inhibitxspcode`#2=2\relax \inhibitglue \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 81e6e73e652..d71f669ed9c 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -114,6 +114,7 @@ \newif\if@restonecol \newif\if@titlepage \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \newif\if@enablejfam \@enablejfamfalse \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}} @@ -198,8 +199,9 @@ \DeclareOption{twocolumn}{\@twocolumntrue} \DeclareOption{titlepage}{\@titlepagetrue} \DeclareOption{notitlepage}{\@titlepagefalse} -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% @@ -485,11 +487,15 @@ \let\bxjs@driver@given\@undefined \bxjs@dvi@opttrue \fi} -\newif\ifbxjs@layout@buggyhmargin \bxjs@layout@buggyhmarginfalse +\newif\ifbxjs@layout@buggyhmargin +\newif\ifbxjs@force@chapterabstract +\bxjs@force@chapterabstracttrue \@namedef{bxjs@kv@layout@v1}{% - \bxjs@layout@buggyhmargintrue} +\bxjs@layout@buggyhmargintrue +} \@namedef{bxjs@kv@layout@v2}{% - \bxjs@layout@buggyhmarginfalse} +\bxjs@layout@buggyhmarginfalse +} \define@key{bxjs}{layout}{% \bxjs@set@keyval{layout}{#1}{}} \define@key{bxjs}{textwidth-limit}{% @@ -500,10 +506,6 @@ \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@dummy@microtype \bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@true\bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@false\bxjs@dummy@microtypefalse -\define@key{bxjs}{dummy-microtype}{\bxjs@set@keyval{dummymicrotype}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -927,12 +929,14 @@ \ifx\bxjs@geometry@driver\relax\else \let\Gm@driver\bxjs@geometry@driver \fi - \@tempdimb=\textwidth - \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi - \divide\textwidth\@tempdima \multiply\textwidth\@tempdima - \advance\@tempdimb-\textwidth - \advance\oddsidemargin 0.5\@tempdimb - \advance\evensidemargin 0.5\@tempdimb + \ifbxjs@whole@zw@lines + \@tempdimb=\textwidth + \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi + \divide\textwidth\@tempdima \multiply\textwidth\@tempdima + \advance\@tempdimb-\textwidth + \advance\oddsidemargin 0.5\@tempdimb + \advance\evensidemargin 0.5\@tempdimb + \fi \fullwidth=\textwidth \ifdim\textwidth>\jsTextWidthLimit\Cwd \textwidth=\jsTextWidthLimit\Cwd @@ -951,7 +955,9 @@ \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% -\textwidth-10\jsc@mmm-\marginparsep} - \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \ifbxjs@whole@zw@lines + \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \fi \maxdepth=.5\topskip \stockwidth=\paperwidth \stockheight=\paperheight @@ -1050,6 +1056,23 @@ \setlength\@dblfptop{0\p@? \@plus 1fil} \setlength\@dblfpsep{8\p@? \@plus 2fil} \setlength\@dblfpbot{0\p@? \@plus 1fil} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\let\pltx@cleartorightpage\pltx@cleartooddpage +\let\pltx@cleartoleftpage\pltx@cleartoevenpage +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -1360,31 +1383,30 @@ \theparagraph.\@arabic\c@subparagraph} \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} -\newcommand\frontmatter{% - \if@openright - \cleardoublepage - \else - \clearpage - \fi + \pltx@cleartooddpage \@mainmatterfalse \pagenumbering{roman}} \newcommand\mainmatter{% - \cleardoublepage + \pltx@cleartooddpage \@mainmattertrue \pagenumbering{arabic}} \newcommand\backmatter{% - \if@openright + \if@openleft + \cleardoublepage + \else\if@openright \cleardoublepage \else \clearpage - \fi + \fi\fi \@mainmatterfalse} \newcommand\part{% - \if@openright + \if@openleft + \cleardoublepage + \else\if@openright \cleardoublepage \else \clearpage - \fi + \fi\fi \thispagestyle{empty}% 欧文用標準スタイルでは plain \if@twocolumn \onecolumn @@ -1420,17 +1442,18 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/13) - \null - \thispagestyle{empty}% - \newpage - \fi %% added (2016/12/13) + \if@openleft %% added (2017/02/24) + \null\thispagestyle{empty}\newpage + \else\if@openright %% added (2016/12/13) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/13, 2017/02/24) \fi \if@restonecol \twocolumn \fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft\cleardoublepage\else + \if@openright\cleardoublepage\else\clearpage\fi\fi \plainifnotempty % 元: \thispagestyle{plain} \global\@topnum\z@ \if@english \@afterindentfalse \else \@afterindenttrue \fi @@ -1520,9 +1543,11 @@ {\normalfont\normalsize\headfont}} \fi \newcommand\jsParagraphMark{\jsJaChar{■}} -\ifx\bxjs@paragraph@mark\@undefined\else +\ifx\bxjs@paragraph@mark\@empty + \let\jsParagraphMark\@empty +\else\ifx\bxjs@paragraph@mark\@undefined\else \long\edef\jsParagraphMark{\noexpand\jsJaChar{\bxjs@paragraph@mark}} -\fi +\fi\fi \let\jsJaChar\@empty \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% @@ -1622,12 +1647,16 @@ \advance \labelwidth by -\labelsep \let \makelabel=\descriptionlabel}}{\endlist} \newcommand*\descriptionlabel[1]{\normalfont\headfont #1\hfil} -\newenvironment{abstract}{% +\newenvironment{chapterabstract}{% \begin{list}{}{% \listparindent=1\jsZw \itemindent=\listparindent \rightmargin=\z@ \leftmargin=5\jsZw}\item[]}{\end{list}\vspace{\baselineskip}} +\ifbxjs@force@chapterabstract + \let\abstract\chapterabstract + \let\endabstract\endchapterabstract +\fi \newenvironment{verse}{% \let \\=\@centercr \list{}{% @@ -1650,14 +1679,14 @@ \def\@opargbegintheorem#1#2#3{\trivlist\labelsep=1\jsZw \item[\hskip \labelsep{\headfont #1\ #2(#3)}]} \newenvironment{titlepage}{% - \cleardoublepage + \pltx@cleartooddpage %% 2017-02-24 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017-02-24 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -2022,8 +2051,8 @@ \def\@@inhibitglue{% \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} \expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% - \def\bxjs@ig@temp{#1}% - \ifx\bxjs@ig@temp\@empty + \def\jsc@ig@temp{#1}% + \ifx\jsc@ig@temp\@empty \ifnum\the\inhibitxspcode`#2=2\relax \inhibitglue \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index cb9c99c5aae..5b917f5103c 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 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 da4ca8c62c5..d67623a4a3d 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 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 b2e5e903fe0..8cf0a83a7a2 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 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 3cce4077a9f..bc6a59088ae 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 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 7ae3589d52b..56f662f3022 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] \input{bxjsja-standard.def} \@onlypreamble\bxjs@set@dupload@proc \def\bxjs@set@dupload@proc#1{% @@ -94,7 +94,13 @@ \if j\jsEngine \bxjs@mark@as@loaded{cmap.sty} \fi -\PassOptionsToPackage{verbose=silent}{microtype} +\if j\jsEngine \else + \PassOptionsToPackage{verbose=silent}{microtype} +\fi +\if j\jsEngine + \bxjs@mark@as@loaded{microtype.sty} + \newcommand*\UseMicrotypeSet[2][]{} +\fi \endinput %% %% End of file `bxjsja-pandoc.def'. diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 83b66207e0c..630e8422472 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -258,7 +258,9 @@ \closein\@inputcheck \endgroup} \@gtempa -\bxjs@fix@hyperref@unicode{false} +\ifbxjs@hyperref@enc + \bxjs@fix@hyperref@unicode{false} +\fi \if \ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx T% \else\ifjsWithpTeXng T\else F\fi\fi T% \ifnum\jis"2121="A1A1 %euc @@ -275,8 +277,6 @@ \fi\fi\fi \let\bxToUnicodeSpecialDone=t \fi -\@namedef{ver@microtype.sty}{2000/01/01} -\newcommand*\UseMicrotypeSet[2][]{} \ifx f\bxjs@enablejfam\else \@enablejfamtrue \fi @@ -301,7 +301,9 @@ whole,autotilde]{bxcjkjatype}[2013/10/15]}% v0.2c \bxjs@nxt \bxjs@cjk@loaded -\PassOptionsToPackage{unicode}{hyperref} +\ifbxjs@hyperref@enc + \PassOptionsToPackage{unicode}{hyperref} +\fi \ifx\bxcjkjatypeHyperrefPatchDone\@undefined \begingroup \CJK@input{UTF8.bdg} @@ -369,7 +371,9 @@ \bxjs@nxt \fi \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99992}>\m@ne - \PassOptionsToPackage{unicode}{hyperref} + \ifbxjs@hyperref@enc + \PassOptionsToPackage{unicode}{hyperref} + \fi \fi \let\jsInhibitGlueAtParTop\@empty \newskip\jsKanjiSkip @@ -447,7 +451,9 @@ luatexja.jfmglue.create_beginpar_node()}} \let\bxjs@ltj@inhibitglue\@inhibitglue \let\@@inhibitglue\@undefined -\bxjs@fix@hyperref@unicode{true} +\ifbxjs@hyperref@enc + \bxjs@fix@hyperref@unicode{true} +\fi \protected\def\autospacing{% \ltjsetparameter{autospacing=true}} \protected\def\noautospacing{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index aa90968f3bf..53db518aef2 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -114,6 +114,7 @@ \newif\if@restonecol \newif\if@titlepage \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \newif\if@enablejfam \@enablejfamfalse \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}} @@ -198,8 +199,9 @@ \DeclareOption{twocolumn}{\@twocolumntrue} \DeclareOption{titlepage}{\@titlepagetrue} \DeclareOption{notitlepage}{\@titlepagefalse} -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% @@ -485,11 +487,15 @@ \let\bxjs@driver@given\@undefined \bxjs@dvi@opttrue \fi} -\newif\ifbxjs@layout@buggyhmargin \bxjs@layout@buggyhmarginfalse +\newif\ifbxjs@layout@buggyhmargin +\newif\ifbxjs@force@chapterabstract +\bxjs@force@chapterabstracttrue \@namedef{bxjs@kv@layout@v1}{% - \bxjs@layout@buggyhmargintrue} +\bxjs@force@chapterabstracttrue +} \@namedef{bxjs@kv@layout@v2}{% - \bxjs@layout@buggyhmarginfalse} +\bxjs@force@chapterabstractfalse +} \define@key{bxjs}{layout}{% \bxjs@set@keyval{layout}{#1}{}} \define@key{bxjs}{textwidth-limit}{% @@ -500,10 +506,6 @@ \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@dummy@microtype \bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@true\bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@false\bxjs@dummy@microtypefalse -\define@key{bxjs}{dummy-microtype}{\bxjs@set@keyval{dummymicrotype}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -914,12 +916,14 @@ \ifx\bxjs@geometry@driver\relax\else \let\Gm@driver\bxjs@geometry@driver \fi - \@tempdimb=\textwidth - \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi - \divide\textwidth\@tempdima \multiply\textwidth\@tempdima - \advance\@tempdimb-\textwidth - \advance\oddsidemargin 0.5\@tempdimb - \advance\evensidemargin 0.5\@tempdimb + \ifbxjs@whole@zw@lines + \@tempdimb=\textwidth + \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi + \divide\textwidth\@tempdima \multiply\textwidth\@tempdima + \advance\@tempdimb-\textwidth + \advance\oddsidemargin 0.5\@tempdimb + \advance\evensidemargin 0.5\@tempdimb + \fi \fullwidth=\textwidth \@tempdimb=\textheight \advance\textheight-\topskip @@ -934,7 +938,9 @@ \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% -\textwidth-10\jsc@mmm-\marginparsep} - \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \ifbxjs@whole@zw@lines + \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \fi \maxdepth=.5\topskip \stockwidth=\paperwidth \stockheight=\paperheight @@ -1033,6 +1039,23 @@ \setlength\@dblfptop{0\p@? \@plus 1fil} \setlength\@dblfpsep{8\p@? \@plus 2fil} \setlength\@dblfpbot{0\p@? \@plus 1fil} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\let\pltx@cleartorightpage\pltx@cleartooddpage +\let\pltx@cleartoleftpage\pltx@cleartoevenpage +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -1343,31 +1366,30 @@ \theparagraph.\@arabic\c@subparagraph} \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} -\newcommand\frontmatter{% - \if@openright - \cleardoublepage - \else - \clearpage - \fi + \pltx@cleartooddpage \@mainmatterfalse \pagenumbering{roman}} \newcommand\mainmatter{% - \cleardoublepage + \pltx@cleartooddpage \@mainmattertrue \pagenumbering{arabic}} \newcommand\backmatter{% - \if@openright + \if@openleft + \cleardoublepage + \else\if@openright \cleardoublepage \else \clearpage - \fi + \fi\fi \@mainmatterfalse} \newcommand\part{% - \if@openright + \if@openleft + \cleardoublepage + \else\if@openright \cleardoublepage \else \clearpage - \fi + \fi\fi \thispagestyle{empty}% 欧文用標準スタイルでは plain \if@twocolumn \onecolumn @@ -1403,17 +1425,18 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/13) - \null - \thispagestyle{empty}% - \newpage - \fi %% added (2016/12/13) + \if@openleft %% added (2017/02/24) + \null\thispagestyle{empty}\newpage + \else\if@openright %% added (2016/12/13) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/13, 2017/02/24) \fi \if@restonecol \twocolumn \fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft\cleardoublepage\else + \if@openright\cleardoublepage\else\clearpage\fi\fi \plainifnotempty % 元: \thispagestyle{plain} \global\@topnum\z@ \if@english \@afterindentfalse \else \@afterindenttrue \fi @@ -1503,9 +1526,11 @@ {\normalfont\normalsize\headfont}} \fi \newcommand\jsParagraphMark{\jsJaChar{■}} -\ifx\bxjs@paragraph@mark\@undefined\else +\ifx\bxjs@paragraph@mark\@empty + \let\jsParagraphMark\@empty +\else\ifx\bxjs@paragraph@mark\@undefined\else \long\edef\jsParagraphMark{\noexpand\jsJaChar{\bxjs@paragraph@mark}} -\fi +\fi\fi \let\jsJaChar\@empty \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% @@ -1605,12 +1630,65 @@ \advance \labelwidth by -\labelsep \let \makelabel=\descriptionlabel}}{\endlist} \newcommand*\descriptionlabel[1]{\normalfont\headfont #1\hfil} -\newenvironment{abstract}{% +\newenvironment{chapterabstract}{% \begin{list}{}{% \listparindent=1\jsZw \itemindent=\listparindent \rightmargin=\z@ \leftmargin=5\jsZw}\item[]}{\end{list}\vspace{\baselineskip}} +\newbox\@abstractbox +\if@titlepage + \newenvironment{abstract}{% + \titlepage + \null\vfil + \@beginparpenalty\@lowpenalty + \begin{center}% + \headfont \abstractname + \@endparpenalty\@M + \end{center}% + \par}% + {\par\vfil\null\endtitlepage} +\else + \newenvironment{abstract}{% + \if@twocolumn + \ifx\maketitle\relax + \section*{\abstractname}% + \else + \global\setbox\@abstractbox\hbox\bgroup + \begin{minipage}[b]{\textwidth} + \small\parindent1\jsZw + \begin{center}% + {\headfont \abstractname\vspace{-.5em}\vspace{\z@}}% + \end{center}% + \list{}{% + \listparindent\parindent + \itemindent \listparindent + \rightmargin \leftmargin}% + \item\relax + \fi + \else + \small + \begin{center}% + {\headfont \abstractname\vspace{-.5em}\vspace{\z@}}% + \end{center}% + \list{}{% + \listparindent\parindent + \itemindent \listparindent + \rightmargin \leftmargin}% + \item\relax + \fi}{\if@twocolumn + \ifx\maketitle\relax + \else + \endlist\end{minipage}\egroup + \fi + \else + \endlist + \fi} +\fi +\ifbxjs@force@chapterabstract + \let\abstract\chapterabstract + \let\endabstract\endchapterabstract +\fi \newenvironment{verse}{% \let \\=\@centercr \list{}{% @@ -1633,14 +1711,13 @@ \def\@opargbegintheorem#1#2#3{\trivlist\labelsep=1\jsZw \item[\hskip \labelsep{\headfont #1\ #2(#3)}]} \newenvironment{titlepage}{% - \cleardoublepage \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017-02-24 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -2005,8 +2082,8 @@ \def\@@inhibitglue{% \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} \expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% - \def\bxjs@ig@temp{#1}% - \ifx\bxjs@ig@temp\@empty + \def\jsc@ig@temp{#1}% + \ifx\jsc@ig@temp\@empty \ifnum\the\inhibitxspcode`#2=2\relax \inhibitglue \fi @@ -2125,6 +2202,7 @@ \newcommand{\figurename}{\if@english Fig.~\else 図\fi} \newcommand{\tablename}{\if@english Table~\else 表\fi} \newcommand{\appendixname}{\if@english \else 付録\fi} +\newcommand{\abstractname}{\if@english Abstract\else 概要\fi} \@tempswafalse \if p\jsEngine \@tempswatrue \fi \if n\jsEngine \@tempswatrue \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 79921c50550..d91a1e746d4 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/02/03 v1.4 BXJS document classes] + [2017/03/11 v1.5 BXJS document classes] %% このファイルは日本語文字を含みます. \RequirePackage{calc} \RequirePackage{keyval} @@ -481,11 +481,12 @@ \let\bxjs@driver@given\@undefined \bxjs@dvi@opttrue \fi} -\newif\ifbxjs@layout@buggyhmargin \bxjs@layout@buggyhmarginfalse +\newif\ifbxjs@layout@buggyhmargin +\newif\ifbxjs@force@chapterabstract \@namedef{bxjs@kv@layout@v1}{% - \bxjs@layout@buggyhmargintrue} +} \@namedef{bxjs@kv@layout@v2}{% - \bxjs@layout@buggyhmarginfalse} +} \define@key{bxjs}{layout}{% \bxjs@set@keyval{layout}{#1}{}} \define@key{bxjs}{textwidth-limit}{% @@ -496,10 +497,6 @@ \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@dummy@microtype \bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@true\bxjs@dummy@microtypetrue -\let\bxjs@kv@dummymicrotype@false\bxjs@dummy@microtypefalse -\define@key{bxjs}{dummy-microtype}{\bxjs@set@keyval{dummymicrotype}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -908,12 +905,14 @@ \ifx\bxjs@geometry@driver\relax\else \let\Gm@driver\bxjs@geometry@driver \fi - \@tempdimb=\textwidth - \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi - \divide\textwidth\@tempdima \multiply\textwidth\@tempdima - \advance\@tempdimb-\textwidth - \advance\oddsidemargin 0.5\@tempdimb - \advance\evensidemargin 0.5\@tempdimb + \ifbxjs@whole@zw@lines + \@tempdimb=\textwidth + \if@twocolumn \@tempdima=2\Cwd \else \@tempdima=1\Cwd \fi + \divide\textwidth\@tempdima \multiply\textwidth\@tempdima + \advance\@tempdimb-\textwidth + \advance\oddsidemargin 0.5\@tempdimb + \advance\evensidemargin 0.5\@tempdimb + \fi \fullwidth=\textwidth \@tempdimb=\textheight \advance\textheight-\topskip @@ -928,7 +927,9 @@ \setlength\marginparpush{\baselineskip} \setlength\marginparwidth{\paperwidth-\oddsidemargin-1truein% -\textwidth-10\jsc@mmm-\marginparsep} - \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \ifbxjs@whole@zw@lines + \divide\marginparwidth\Cwd \multiply\marginparwidth\Cwd + \fi \maxdepth=.5\topskip \stockwidth=\paperwidth \stockheight=\paperheight @@ -1027,6 +1028,18 @@ \setlength\@dblfptop{0\p@? \@plus 1fil} \setlength\@dblfpsep{8\p@? \@plus 2fil} \setlength\@dblfpbot{0\p@? \@plus 1fil} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\let\pltx@cleartorightpage\pltx@cleartooddpage +\let\pltx@cleartoleftpage\pltx@cleartoevenpage \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -1410,9 +1423,11 @@ {\normalfont\normalsize\headfont}} \fi \newcommand\jsParagraphMark{\jsJaChar{■}} -\ifx\bxjs@paragraph@mark\@undefined\else +\ifx\bxjs@paragraph@mark\@empty + \let\jsParagraphMark\@empty +\else\ifx\bxjs@paragraph@mark\@undefined\else \long\edef\jsParagraphMark{\noexpand\jsJaChar{\bxjs@paragraph@mark}} -\fi +\fi\fi \let\jsJaChar\@empty \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% @@ -1521,7 +1536,8 @@ \begin{center}% \headfont \abstractname \@endparpenalty\@M - \end{center}}% + \end{center}% + \par}% {\par\vfil\null\endtitlepage} \else \newenvironment{abstract}{% @@ -1588,7 +1604,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017-02-24 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -1929,8 +1945,8 @@ \def\@@inhibitglue{% \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end} \expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{% - \def\bxjs@ig@temp{#1}% - \ifx\bxjs@ig@temp\@empty + \def\jsc@ig@temp{#1}% + \ifx\jsc@ig@temp\@empty \ifnum\the\inhibitxspcode`#2=2\relax \inhibitglue \fi |