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/doc/latex/bxjscls/README-ja.md | 2 ++ Master/texmf-dist/doc/latex/bxjscls/README.md | 1 + .../doc/latex/bxjscls/bxjscls-manual.pdf | Bin 635563 -> 729019 bytes .../doc/latex/bxjscls/bxjscls-manual.tex | 4 ++-- Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf | Bin 1051568 -> 1152167 bytes Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx | 26 ++++++++++++++------- .../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 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 18 ++++++++------ .../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 +- 17 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md index 5dce4a844e8..00b2b20ffa8 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md @@ -98,6 +98,8 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使 更新履歴 -------- + * Version 1.9i 〈2019/11/24〉 + - Pandoc モードを最新の Pandoc に対応させる。 * Version 1.9h 〈2019/07/27〉 - jsclasses の 2019/07/25 と同期。 - バグ修正。 diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md index c0071f88245..bd1505a2296 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README.md @@ -88,6 +88,7 @@ This package is distributed under the BSD 2-Clause License. Revision History ---------------- + * Version 1.9i 〈2019/11/24〉 * Version 1.9h 〈2019/07/27〉 * Version 1.9g 〈2019/06/23〉 * Version 1.9f 〈2019/03/10〉 diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf index 00b4706eec5..8b304a1f972 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex index fd0a4a019de..72ea349c96a 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex @@ -12,8 +12,8 @@ \renewcommand*{\XeLaTeX}{XeLaTeX}} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.9h} -\newcommand{\PkgDate}{2019/07/27} +\newcommand{\PkgVersion}{1.9i} +\newcommand{\PkgDate}{2019/11/24} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\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 bc7df6ed8d3..8f525c313c7 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf differ diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx index c46d0fd9b79..d5f56464857 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx @@ -56,7 +56,8 @@ %<*driver> \ProvidesFile{bxjscls.dtx} % - [2019/07/27 v1.9h BXJS document classes] + [2019/11/24 v1.9i BXJS document classes] +% [2019/07/27 v1.9h BXJS document classes] % based on jsclasses [2019/07/25] % [2019/06/23 v1.9g BXJS document classes] % [2019/03/10 v1.9f BXJS document classes] @@ -10404,7 +10405,7 @@ \ClassWarning\bxjs@clsname {Main language is invalid, thus the fallback\MessageBreak definitions will be employed}% - \bxjs@pandoc@lang@ja + \bxjs@pandoc@polyglossia@ja % \end{macrocode} % 言語名が非空ならば、本来の |polyglossia| の処理を実行する。 % \begin{macrocode} @@ -10430,13 +10431,13 @@ \fi} % \end{macrocode} % -% \begin{macro}{\bxjs@pandoc@lang@ja} +% \begin{macro}{\bxjs@pandoc@polyglossia@ja} % Pandoc側で |lang=ja| が指定されていた場合の処理。 % この場合はPolyglossiaの処理を無効化するためにダミーの定義を行う。 % その時点でダミーの |\setotherlanguage(s)| を定義する。 % \begin{macrocode} -\@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 @@ -10488,7 +10489,7 @@ \ClassWarning\bxjs@clsname {Main language is invalid, so fallback\MessageBreak definitions will be employed}% - \bxjs@pandoc@lang@ja + \bxjs@pandoc@polyglossia@ja % \end{macrocode} % ない場合は、本来の |babel| の処理を実行する。 % \begin{macrocode} @@ -10510,11 +10511,11 @@ \fi} % \end{macrocode} % -% \begin{macro}{\bxjs@pandoc@lang@ja} +% \begin{macro}{\bxjs@pandoc@babel@ja} % Pandoc側で |lang=ja| が指定されていた場合の処理。 % \begin{macrocode} -\@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}[]% @@ -10552,6 +10553,13 @@ \providecommand*{\setCJKmainfont}{\setmainjfont} \fi % \end{macrocode} +% ムニャムニャムニャ。 +% \begin{macrocode} +\if x\jsEngine + \expandafter\g@addto@macro\csname opt@xeCJK.sty\endcsname{% + ,space} +\fi +% \end{macrocode} % %^^A---------------- %\subsection{paragraphのマーク} 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