From 0c77f5a20c91f0bf16aca7cda36f154161e06afc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 May 2021 20:14:54 +0000 Subject: bxjscls (18may21) git-svn-id: svn://tug.org/texlive/trunk@59253 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 5 ++-- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 5 ++-- 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 | 31 +++++++++++++++++++++- .../tex/latex/bxjscls/bxjsja-standard.def | 7 ++++- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 5 ++-- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 5 ++-- 11 files changed, 53 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 1925824c606..7032930c8fd 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -769,8 +769,9 @@ \fi \def\bxjs@@pandoc{pandoc} \ifx\bxjs@jadriver\bxjs@@pandoc \ifx\bxjs@plautopatch@given\@undefined + \ifjsWitheTeX \bxjs@plautopatchtrue -\fi\fi +\fi\fi\fi \ifx j\jsEngine \ifbxjs@plautopatch \RequirePackage{plautopatch}[2018/08/22]%v0.3 \fi\fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 9517b85dc06..62d6aec7f98 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -778,8 +778,9 @@ \fi \def\bxjs@@pandoc{pandoc} \ifx\bxjs@jadriver\bxjs@@pandoc \ifx\bxjs@plautopatch@given\@undefined + \ifjsWitheTeX \bxjs@plautopatchtrue -\fi\fi +\fi\fi\fi \ifx j\jsEngine \ifbxjs@plautopatch \RequirePackage{plautopatch}[2018/08/22]%v0.3 \fi\fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index a0d45a4222c..5cf64e98d23 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjscjkcat} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \@onlypreamble\bxjx@tmpdo diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty index 58d81eb641d..a89c3a72729 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjscompat} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a 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 9acf687e3b0..1017aa84960 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a 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 5b09a0d548b..a6c4f15f4e8 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a 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 19cea1b1933..8853a2d2eb7 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def @@ -21,14 +21,22 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-pandoc.def} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} +\ifjsWitheTeX\else + \ClassWarningNoLine\bxjs@clsname + {!!!!!!!! WARNING !!!!!!!!\MessageBreak + This engine does not support e-TeX extension!\MessageBreak + Some feature might not work properly} +\fi \@onlypreamble\bxjs@endpreamble@hook \let\bxjs@endpreamble@hook\@empty +\RequirePackage{iftex}[2013/04/04]% v0.2 \ifjsWitheTeX \RequirePackage{etoolbox}[2010/08/21]% v2.0 \AtEndPreamble{\bxjs@endpreamble@hook} + \RequirePackage{filehook}[2011/10/12]% v0.5d \fi \newif\ifbxjs@jp@fix@strong \bxjs@jp@fix@strongtrue \let\bxjs@kv@fixstrong@true\bxjs@jp@fix@strongtrue @@ -293,6 +301,27 @@ \g@addto@macro\verb@egroup{\bxjs@pan@eghost} \fi \fi +\if j\jsEngine + \def\bxjs@check@frontier{% + \expandafter\bxjs@check@frontier@a\@currnamestack\noindent...\@nil} + \def\bxjs@check@frontier@a#1#2#3#4#5\@nil#6{% + \ifx\noindent#4#6\fi} + \@onlypreamble\bxjs@unforge@ifPDFTeX + \def\bxjs@unforge@ifPDFTeX{\global\bxjs@csletcs{ifPDFTeX}{iffalse}} + \@onlypreamble\bxjs@forge@ifPDFTeX + \def\bxjs@forge@ifPDFTeX{\global\bxjs@csletcs{ifPDFTeX}{iftrue}} + \def\bxjs@unload@forge@ifPDFTeX{% + \bxjs@unforge@ifPDFTeX + \global\let\bxjs@check@frontier\@gobble} + \jsAtEndOfClass{\bxjs@forge@ifPDFTeX} + \ifjsWitheTeX + \AtBeginOfEveryFile{\bxjs@check@frontier\bxjs@unforge@ifPDFTeX}% + \AtEndOfEveryFile{\bxjs@check@frontier\bxjs@forge@ifPDFTeX}% + \g@addto@macro\bxjs@endpreamble@hook{\bxjs@unload@forge@ifPDFTeX} + \else + \g@addto@macro\bxjs@begin@document@hook{\bxjs@unload@forge@ifPDFTeX} + \fi +\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 2be2fa09a83..29b7472c0fb 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -397,6 +397,11 @@ \bxjs@g@tmpa \ifbxjs@hyperref@enc \bxjs@check@hyperref@unicode{false} + \ifjsWithupTeX\ifbxjs@old@hook@system\else + \IfFileExists{pxjahyper-uni.def}{% + \AddToHook{package/after/hyperref}{\input{pxjahyper-uni.def}} + }{} + \fi\fi \fi \if \ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx T% \else\ifjsWithpTeXng T\else F\fi\fi T% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index f4e69960b5a..d3d6d416bf2 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjspandoc} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 192b8aab597..4d49391eb16 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -777,8 +777,9 @@ \fi \def\bxjs@@pandoc{pandoc} \ifx\bxjs@jadriver\bxjs@@pandoc \ifx\bxjs@plautopatch@given\@undefined + \ifjsWitheTeX \bxjs@plautopatchtrue -\fi\fi +\fi\fi\fi \ifx j\jsEngine \ifbxjs@plautopatch \RequirePackage{plautopatch}[2018/08/22]%v0.3 \fi\fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index a4473bfddd3..19ad80f2e48 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} - [2021/02/02 v2.5 BXJS document classes] + [2021/05/18 v2.5a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -769,8 +769,9 @@ \fi \def\bxjs@@pandoc{pandoc} \ifx\bxjs@jadriver\bxjs@@pandoc \ifx\bxjs@plautopatch@given\@undefined + \ifjsWitheTeX \bxjs@plautopatchtrue -\fi\fi +\fi\fi\fi \ifx j\jsEngine \ifbxjs@plautopatch \RequirePackage{plautopatch}[2018/08/22]%v0.3 \fi\fi -- cgit v1.2.3