From 516124d8de871007f2d2443daf2b7faff9f7c2ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Jun 2016 23:24:41 +0000 Subject: bxjscls (28may16) git-svn-id: svn://tug.org/texlive/trunk@41394 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 25 ++++++++++++++++++++-- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 25 ++++++++++++++++++++-- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../tex/latex/bxjscls/bxjsja-standard.def | 12 +++++++++-- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 25 ++++++++++++++++++++-- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 25 ++++++++++++++++++++-- 10 files changed, 107 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 6a592e42ed4..5c56383c0ec 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -333,6 +333,15 @@ \bxjs@simplejasetupfalse} \DeclareOption{simplejasetup}{% \bxjs@simplejasetuptrue} +\newif\ifbxjs@bigcode \bxjs@bigcodefalse +\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} +\def\bxjs@tmpb#1 #2#3\@nil{% + \ifx1#2\bxjs@bigcodetrue \fi} +\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\DeclareOption{nobigcode}{% + \bxjs@bigcodefalse} +\DeclareOption{bigcode}{% + \bxjs@bigcodetrue} \def\bxjs@setkey{% \expandafter\bxjs@setkey@a\expandafter{\CurrentOption}} \def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}} @@ -911,7 +920,17 @@ \let\sectionmark\@gobble \let\subsectionmark\@gobble } -\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}} +\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}} +\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}} +\AtBeginDocument{\bxjs@decl@subtitle} +\def\bxjs@decl@subtitle{% + \global\let\bxjs@decl@subtitle\relax + \ifx\subtitle\@undefined + \global\let\subtitle\jsSubtitle + \fi} +\def\bxjs@annihilate@subtitle{% + \ifx\subtitle\jsSubtitle \global\let\subtitle\relax \fi + \global\let\jsSubtitle\relax} \def\plainifnotempty{% \ifx \@oddhead \@empty \ifx \@oddfoot \@empty @@ -977,6 +996,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle }% \else \newcommand{\maketitle}{\par @@ -1011,6 +1031,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle } \def\@maketitle{% \newpage\null diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 9f8d2cd91d4..60b2e4064c3 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -337,6 +337,15 @@ \bxjs@simplejasetupfalse} \DeclareOption{simplejasetup}{% \bxjs@simplejasetuptrue} +\newif\ifbxjs@bigcode \bxjs@bigcodefalse +\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} +\def\bxjs@tmpb#1 #2#3\@nil{% + \ifx1#2\bxjs@bigcodetrue \fi} +\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\DeclareOption{nobigcode}{% + \bxjs@bigcodefalse} +\DeclareOption{bigcode}{% + \bxjs@bigcodetrue} \def\bxjs@setkey{% \expandafter\bxjs@setkey@a\expandafter{\CurrentOption}} \def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}} @@ -914,7 +923,17 @@ \let\chaptermark\@gobble \let\sectionmark\@gobble } -\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}} +\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}} +\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}} +\AtBeginDocument{\bxjs@decl@subtitle} +\def\bxjs@decl@subtitle{% + \global\let\bxjs@decl@subtitle\relax + \ifx\subtitle\@undefined + \global\let\subtitle\jsSubtitle + \fi} +\def\bxjs@annihilate@subtitle{% + \ifx\subtitle\jsSubtitle \global\let\subtitle\relax \fi + \global\let\jsSubtitle\relax} \def\plainifnotempty{% \ifx \@oddhead \@empty \ifx \@oddfoot \@empty @@ -980,6 +999,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle }% \else \newcommand{\maketitle}{\par @@ -1014,6 +1034,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle } \def\@maketitle{% \newpage\null diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 98650e0d12e..403608ee8ee 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e 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 84447709b31..f6203d5f4e6 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e 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 90fec99dd96..4a925d1c281 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e 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 71e853022ce..0a495baf6d5 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e 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 b935ca249e4..a9d641e5dbb 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e 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 2cd4975fe53..3dd5e2baf04 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -275,7 +275,12 @@ \else\ifnum\jis"2121="8140 %sjis \bxjs@urgent@special{pdf:tounicode 90ms-RKSJ-UCS2} \else\ifnum\jis"2121="3000 %uptex - \bxjs@urgent@special{pdf:tounicode UTF8-UCS2} + \ifbxjs@bigcode + \bxjs@urgent@special{pdf:tounicode UTF8-UTF16} + \PassOptionsToPackage{bigcode}{pxjahyper} + \else + \bxjs@urgent@special{pdf:tounicode UTF8-UCS2} + \fi \fi\fi\fi \let\bxToUnicodeSpecialDone=t \fi @@ -351,6 +356,9 @@ {zxjafont}[2013/01/28]}% v0.2a \bxjs@nxt \fi +\ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99992}>\m@ne + \PassOptionsToPackage{unicode}{hyperref} +\fi \let\jsInhibitGlueAtParTop\@inhibitglue \newskip\jsKanjiSkip \newskip\jsXKanjiSkip diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index ac66b7427a9..cc93f0e2fb8 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -337,6 +337,15 @@ \bxjs@simplejasetupfalse} \DeclareOption{simplejasetup}{% \bxjs@simplejasetuptrue} +\newif\ifbxjs@bigcode \bxjs@bigcodefalse +\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} +\def\bxjs@tmpb#1 #2#3\@nil{% + \ifx1#2\bxjs@bigcodetrue \fi} +\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\DeclareOption{nobigcode}{% + \bxjs@bigcodefalse} +\DeclareOption{bigcode}{% + \bxjs@bigcodetrue} \def\bxjs@setkey{% \expandafter\bxjs@setkey@a\expandafter{\CurrentOption}} \def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}} @@ -910,7 +919,17 @@ \let\chaptermark\@gobble \let\sectionmark\@gobble } -\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}} +\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}} +\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}} +\AtBeginDocument{\bxjs@decl@subtitle} +\def\bxjs@decl@subtitle{% + \global\let\bxjs@decl@subtitle\relax + \ifx\subtitle\@undefined + \global\let\subtitle\jsSubtitle + \fi} +\def\bxjs@annihilate@subtitle{% + \ifx\subtitle\jsSubtitle \global\let\subtitle\relax \fi + \global\let\jsSubtitle\relax} \def\plainifnotempty{% \ifx \@oddhead \@empty \ifx \@oddfoot \@empty @@ -976,6 +995,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle }% \else \newcommand{\maketitle}{\par @@ -1010,6 +1030,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle } \def\@maketitle{% \newpage\null diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 35a8c805dc4..3ac22811c68 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/05/01 v1.1c BXJS document classes] + [2016/05/28 v1.1e BXJS document classes] %% このファイルは日本語文字を含みます \RequirePackage{calc} \RequirePackage{keyval} @@ -333,6 +333,15 @@ \bxjs@simplejasetupfalse} \DeclareOption{simplejasetup}{% \bxjs@simplejasetuptrue} +\newif\ifbxjs@bigcode \bxjs@bigcodefalse +\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} +\def\bxjs@tmpb#1 #2#3\@nil{% + \ifx1#2\bxjs@bigcodetrue \fi} +\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\DeclareOption{nobigcode}{% + \bxjs@bigcodefalse} +\DeclareOption{bigcode}{% + \bxjs@bigcodetrue} \def\bxjs@setkey{% \expandafter\bxjs@setkey@a\expandafter{\CurrentOption}} \def\bxjs@setkey@a{\bxjs@safe@setkeys{bxjs}} @@ -909,7 +918,17 @@ \let\sectionmark\@gobble \let\subsectionmark\@gobble } -\newcommand*{\subtitle}[1]{\gdef\bxjs@subtitle{#1}} +\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}} +\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}} +\AtBeginDocument{\bxjs@decl@subtitle} +\def\bxjs@decl@subtitle{% + \global\let\bxjs@decl@subtitle\relax + \ifx\subtitle\@undefined + \global\let\subtitle\jsSubtitle + \fi} +\def\bxjs@annihilate@subtitle{% + \ifx\subtitle\jsSubtitle \global\let\subtitle\relax \fi + \global\let\jsSubtitle\relax} \def\plainifnotempty{% \ifx \@oddhead \@empty \ifx \@oddfoot \@empty @@ -975,6 +994,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle }% \else \newcommand{\maketitle}{\par @@ -1009,6 +1029,7 @@ \global\let\author\relax \global\let\date\relax \global\let\and\relax + \bxjs@annihilate@subtitle } \def\@maketitle{% \newpage\null -- cgit v1.2.3