summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README-ja.md3
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README.md1
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdfbin382171 -> 381683 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdfbin1173357 -> 1173834 bytes
-rw-r--r--Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def9
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls2
18 files changed, 39 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/LICENSE b/Master/texmf-dist/doc/latex/bxjscls/LICENSE
index b1ab4fd4828..9f9db67d1e7 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxjscls/LICENSE
@@ -3,7 +3,7 @@ The BSD 2-Clause License
Copyright 1995-1999 ASCII Corporation.
Copyright 1999-2016 Haruhiko Okumura
Copyright 2016-2020 Japanese TeX Development Community
-Copyright 2013-2020 Takayuki YATO (aka. "ZR")
+Copyright 2013-2021 Takayuki YATO (aka. "ZR")
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index 431c8fe52c7..7d1f903246d 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
@@ -99,6 +99,9 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使
更新履歴
--------
+ * Version 2.4a 〈2021/01/27〉
+ - pandoc 和文ドライバにおいて、Polyglossia で `japanese` が指定
+ された場合も独自処理に切り替える。
* Version 2.4 〈2020/10/16〉
- geometry と互換の用紙サイズ名オプションを追加。
- `iso-bsize` オプションを追加。
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index f8f8eeb3034..15ed06c5361 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -89,6 +89,7 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 2.4a 〈2021/01/27〉
* Version 2.4 〈2020/10/16〉
* Version 2.3 〈2020/10/10〉
- Sync with jsclasses 2020/10/05.
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 4b188a5a493..8291a8f6eab 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
index c0d2c109f55..5d3431d5b04 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
@@ -11,8 +11,8 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{2.4}
-\newcommand{\PkgDate}{2020/10/16}
+\newcommand{\PkgVersion}{2.4a}
+\newcommand{\PkgDate}{2021/01/27}
\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 7700df43b61..dee87a64e47 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index 5ca16063ebc..8f3131287df 100644
--- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
+++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
@@ -33,7 +33,7 @@
% Copyright 1999-2016 Haruhiko Okumura
% Copyright 2016-2020 Japanese TeX Development Community
%
-% Copyright 2013-2020 Takayuki YATO (aka. "ZR")
+% Copyright 2013-2021 Takayuki YATO (aka. "ZR")
%
% \fi
% \CheckSum{0}
@@ -56,7 +56,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a BXJS document classes]
+% [2020/10/16 v2.4 BXJS document classes]
% [2020/10/10 v2.3 BXJS document classes]
% based on jsclasses [2020/10/05]
% [2020/10/04 v2.2c BXJS document classes]
@@ -10739,6 +10740,14 @@
definitions will be employed}%
\bxjs@pandoc@polyglossia@ja
% \end{macrocode}
+% 言語名が |japanese| だった場合も同様。
+% \begin{macrocode}
+ }{\ifstrequal{##2}{japanese}{%
+ \ClassWarning\bxjs@clsname
+ {Main language is japanese, thus the fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs@pandoc@polyglossia@ja
+% \end{macrocode}
% 言語名が非空ならば、本来の |polyglossia| の処理を実行する。
% \begin{macrocode}
}{%else
@@ -10750,7 +10759,7 @@
\noexpand\RequirePackage[\bxjs@polyglossia@options]{polyglossia}[]%
}\bxjs@next
\setmainlanguage[##1]{##2}%
- }}}
+ }}}}
% \end{macrocode}
%
% プレアンブルで |polyglossia| の読込が指示されなかった場合、
@@ -10767,6 +10776,9 @@
% Pandoc側で |lang=ja| が指定されていた場合の処理。
% この場合はPolyglossiaの処理を無効化するためにダミーの定義を行う。
% その時点でダミーの |\setotherlanguage(s)| を定義する。
+% \Note 現在ではPolyglossiaの日本語用の定義ファイル
+% (|gloss-japanese.ldf|)が存在するので、本来なら普通に処理できる
+% はずであるが、現状の定義ファイルはアレなので回避したい。
% \begin{macrocode}
\@onlypreamble\bxjs@pandoc@polyglossia@ja
\def\bxjs@pandoc@polyglossia@ja{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 4f2e47222cb..037db9189a8 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 6b8e939c8fe..ddbe55ac708 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 0b28bb59520..0b03ebc4d79 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 97668c38da6..9cf23383b8f 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 7ae20c8ba21..7c154bbde8f 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 063306f5106..cb366c38827 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 72ec49d667f..496881b830a 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\@onlypreamble\bxjs@endpreamble@hook
@@ -115,6 +115,11 @@
{Main language is invalid, thus the fallback\MessageBreak
definitions will be employed}%
\bxjs@pandoc@polyglossia@ja
+ }{\ifstrequal{##2}{japanese}{%
+ \ClassWarning\bxjs@clsname
+ {Main language is japanese, thus the fallback\MessageBreak
+ definitions will be employed}%
+ \bxjs@pandoc@polyglossia@ja
}{%else
\ClassWarning\bxjs@clsname
{Main language is valid (##2),\MessageBreak
@@ -124,7 +129,7 @@
\noexpand\RequirePackage[\bxjs@polyglossia@options]{polyglossia}[]%
}\bxjs@next
\setmainlanguage[##1]{##2}%
- }}}
+ }}}}
\g@addto@macro\bxjs@endpreamble@hook{%
\ifx\bxjs@polyglossia@options\relax
\csundef{ver@polyglossia.sty}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index d6bbb76bd6d..00d1f1e73fd 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 29346bf1bca..3117ee55aed 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 d5222dbe4ef..2dd0ae1e588 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a 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 d5361792440..a57e25160f7 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}
- [2020/10/16 v2.4 BXJS document classes]
+ [2021/01/27 v2.4a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch