From fa6c59acaa9a39e94ad46785611fd55dde8bb6e5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Nov 2019 21:35:40 +0000 Subject: bxjscls (26nov19) git-svn-id: svn://tug.org/texlive/trunk@52927 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 18 +++++++++++------- .../texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 2 +- 11 files changed, 21 insertions(+), 17 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 01952a192f9..0ed21e157ec 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index d8baa6f5842..ee262c4a972 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 8802594f910..edf87d776b2 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i 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 5629b9f0f58..a44a286741b 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i 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 cc95dceaacb..5c3db143d57 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i 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 61597297920..1561e78aa1c 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i 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 4e4c9f10abd..b0afcc0841d 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@endpreamble@hook @@ -77,7 +77,7 @@ \ClassWarning\bxjs@clsname {Main language is invalid, thus the fallback\MessageBreak definitions will be employed}% - \bxjs@pandoc@lang@ja + \bxjs@pandoc@polyglossia@ja }{%else \ClassWarning\bxjs@clsname {Main language is valid (##2),\MessageBreak @@ -92,8 +92,8 @@ \ifx\bxjs@polyglossia@options\relax \csundef{ver@polyglossia.sty}% \fi} -\@onlypreamble\bxjs@pandoc@lang@ja -\def\bxjs@pandoc@lang@ja{% +\@onlypreamble\bxjs@pandoc@polyglossia@ja +\def\bxjs@pandoc@polyglossia@ja{% \renewcommand*\setmainlanguage[2][]{}% \newcommand*\setotherlanguage[2][]{% \ifblank{##2}{}{%else @@ -120,7 +120,7 @@ \ClassWarning\bxjs@clsname {Main language is invalid, so fallback\MessageBreak definitions will be employed}% - \bxjs@pandoc@lang@ja + \bxjs@pandoc@polyglossia@ja \else \ClassWarning\bxjs@clsname {Main language is valid,\MessageBreak @@ -132,8 +132,8 @@ \ifx\bxjs@babel@options\relax \expandafter\let\csname ver@babel.sty\endcsname\@undefined \fi} -\@onlypreamble\bxjs@pandoc@lang@ja -\def\bxjs@pandoc@lang@ja{% +\@onlypreamble\bxjs@pandoc@babel@ja +\def\bxjs@pandoc@babel@ja{% \expandafter\let\csname ver@babel.sty\endcsname\@undefined \edef\bxjs@next{% \noexpand\RequirePackage[\bxjs@babel@options,english]{babel}[]% @@ -150,6 +150,10 @@ \pandocSkipLoadPackage{xeCJK} \providecommand*{\setCJKmainfont}{\setmainjfont} \fi +\if x\jsEngine + \expandafter\g@addto@macro\csname opt@xeCJK.sty\endcsname{% + ,space} +\fi \g@addto@macro\bxjs@begin@document@hook{% \@tempswafalse \ifx\oldparagraph\@undefined\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 6fc5f845737..457a138d0bf 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index 721f638a990..9362d3adea5 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjspandoc} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i 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 26d3bec0cd4..b12bb70715d 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index ff2392dfe32..9f6bad01194 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} - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch -- cgit v1.2.3