From 839173be16441663c136cac16d77c95f0bf83213 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Sep 2017 23:11:46 +0000 Subject: bidi (24sep17) git-svn-id: svn://tug.org/texlive/trunk@45420 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 | 41 ++++------ .../tex/latex/bxjscls/bxjsja-standard.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 94 ++++++++++++++++++++++ Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 5 +- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 5 +- 11 files changed, 127 insertions(+), 38 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty (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 7d9e6dde4b2..7a22892d8e5 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -1487,7 +1487,8 @@ {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi -\newcommand\jsParagraphMark{\jsJaChar{■}} +\newcommand\jsParagraphMark{\relax\jsJaChar{■}} +\let\bxjs@org@paragraph@mark\jsParagraphMark \ifx\bxjs@paragraph@mark\@empty \let\jsParagraphMark\@empty \else\ifx\bxjs@paragraph@mark\@undefined\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index c1edf302d0a..5a89ea06886 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -1608,7 +1608,8 @@ {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi -\newcommand\jsParagraphMark{\jsJaChar{■}} +\newcommand\jsParagraphMark{\relax\jsJaChar{■}} +\let\bxjs@org@paragraph@mark\jsParagraphMark \ifx\bxjs@paragraph@mark\@empty \let\jsParagraphMark\@empty \else\ifx\bxjs@paragraph@mark\@undefined\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index d5d539f1497..8ac1d5150c5 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a 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 6bda051b740..e72267bcb31 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a 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 cd79362ec15..8b6e7326583 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a 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 c55014f5cce..1d66deb3f7e 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a 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 34044de2fec..1412fa21374 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def @@ -21,8 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-pandoc.def} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a BXJS document classes] \input{bxjsja-standard.def} +\RequirePackage{bxjspandoc} \@onlypreamble\bxjs@set@dupload@proc \def\bxjs@set@dupload@proc#1{% \expandafter\bxjs@set@dupload@proc@a\csname bxjs@dlp/#1\endcsname} @@ -48,16 +49,8 @@ \def\bxjs@do@dupload@proc#1#2#3{% \csname bxjs@dlp/#2.#1\endcsname{#3}% \@firstoftwo} -\def\bxjs@mark@as@loaded#1{% - \expandafter\bxjs@mal@a\csname ver@#1\endcsname{#1}} -\def\bxjs@mal@a#1#2{% - \ifx#1\relax - \def#1{2001/01/01}% - \ClassInfo\bxjs@clsname - {File '#2' marked as loaded\@gobble}% - \fi} \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0 -\bxjs@mark@as@loaded{polyglossia.sty} +\pandocSkipLoadPackage{polyglossia} \bxjs@set@dupload@proc{polyglossia.sty}{% \ClassWarning\bxjs@clsname {Loading of polyglossia is blocked}} @@ -74,7 +67,7 @@ \setotherlangauge{\bxjs@tmpa}}} \fi \else -\bxjs@mark@as@loaded{babel.sty} +\pandocSkipLoadPackage{babel} \bxjs@set@dupload@proc{babel.sty}{% \ClassWarning\bxjs@clsname {Loading of babel is blocked}} @@ -85,22 +78,20 @@ \bxjs@set@dupload@proc{geometry.sty}{% \setpagelayout*{#1}} \if l\jsEngine - \bxjs@mark@as@loaded{xeCJK.sty} + \pandocSkipLoadPackage{xeCJK} \providecommand*{\setCJKmainfont}{\setmainjfont} \fi -\ifx\@IncludeInRelease\@undefined\else - \bxjs@mark@as@loaded{fixltx2e.sty} -\fi -\if j\jsEngine - \bxjs@mark@as@loaded{cmap.sty} -\fi -\if j\jsEngine \else - \PassOptionsToPackage{verbose=silent}{microtype} -\fi -\if j\jsEngine - \bxjs@mark@as@loaded{microtype.sty} - \newcommand*\UseMicrotypeSet[2][]{} -\fi +\AtBeginDocument{% + \@tempswafalse + \ifx\oldparagraph\@undefined\else + \@tempswatrue + \fi + \ifnum\c@secnumdepth>3 + \@tempswatrue + \fi + \if@tempswa\ifx\jsParagraphMark\bxjs@org@paragraph@mark + \let\jsParagraphMark\@empty + \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 0e8387a6636..3f9d1282d58 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a 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 new file mode 100644 index 00000000000..914ac949ec9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -0,0 +1,94 @@ +%% +%% This is file `bxjspandoc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bxjscls.dtx (with options: `anc,ancpandoc') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from bxjspandoc.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file bxjscls.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\ProvidesPackage{bxjspandoc} + [2017/09/24 v1.6a BXJS document classes] +%% このファイルは日本語文字を含みます. +\def\bxjsp@pkgname{bxjscjkcat} +\let\bxjsp@engine=n +\@onlypreamble\bxjsp@do +\def\bxjsp@do#1#2{% + \edef\bxjsp@tmpa{\string#1}% + \edef\bxjsp@tmpb{\meaning#1}% + \ifx\bxjsp@tmpa\bxjsp@tmpb #2\fi} +\bxjsp@do\kanjiskip{\let\bxjsp@engine=j} +\bxjsp@do\XeTeXversion{\let\bxjsp@engine=x} +\bxjsp@do\pdftexversion{\let\bxjsp@engine=p} +\bxjsp@do\luatexversion{\let\bxjsp@engine=l} +\newcommand*\pandocSkipLoadFile[1]{% + \expandafter\bxjsp@skip@load@file@a\csname ver@#1\endcsname{#1}} +\def\bxjsp@skip@load@file@a#1#2{% + \ifx#1\relax + \def#1{2001/01/01}% + \PackageInfo\bxjsp@pkgname + {File '#2' marked as loaded\@gobble}% + \fi} +\newcommand*\pandocSkipLoadPackage[1]{% + \pandocSkipLoadFile{#1.sty}} +\ifx\@IncludeInRelease\@undefined\else + \pandocSkipLoadPackage{fixltx2e} +\fi +\if j\bxjsp@engine + \pandocSkipLoadPackage{cmap} +\fi +\if j\bxjsp@engine \else + \PassOptionsToPackage{verbose=silent}{microtype} +\fi +\if j\bxjsp@engine + \pandocSkipLoadPackage{microtype} + \newcommand*\UseMicrotypeSet[2][]{} +\fi +\DeclareRobustCommand{\pandocLdots}{% + \relax\ifmmode \expandafter\bxjsp@org@ldots + \else \expandafter\bxjsp@ldots@a + \fi} +\def\bxjsp@ja@ellipsis{…} +\let\bxjsp@org@ldots\ldots +\def\bxjsp@ldots@a{% + \futurelet\bxjsp@tok\bxjsp@ldots@b} +\def\bxjsp@ldots@b{% + \ifx\bxjsp@tok\bgroup \expandafter\bxjsp@ldots@c + \else \expandafter\bxjsp@org@ldots + \fi} +\def\bxjsp@ldots@c{% + \afterassignment\bxjsp@ldots@d \let\bxjsp@tok=} +\def\bxjsp@ldots@d{% + \futurelet\bxjsp@tok\bxjsp@ldots@e} +\def\bxjsp@ldots@e{% + \ifx\bxjsp@tok\egroup \expandafter\bxjsp@ldots@f + \else \expandafter\bxjsp@ldots@g + \fi} +\def\bxjsp@ldots@f{% + \bxjsp@ja@ellipsis \let\bxjsp@tok=} +\def\bxjsp@ldots@g{% + \expandafter\bxjsp@org@ldots\expandafter{\romannumeral-`} } +\AtBeginDocument{% + \let\bxjsp@org@ldots\ldots + \let\ldots\pandocLdots} +\IfFileExists{bxpandola.sty}{% + \RequirePackage{bxpandola}\relax + \PackageInfo\bxjsp@pkgname + {PandoLa module is loaded\@gobble} +}{} +\endinput +%% +%% End of file `bxjspandoc.sty'. diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 945ae1331e4..de3554ba617 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -1590,7 +1590,8 @@ {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi -\newcommand\jsParagraphMark{\jsJaChar{■}} +\newcommand\jsParagraphMark{\relax\jsJaChar{■}} +\let\bxjs@org@paragraph@mark\jsParagraphMark \ifx\bxjs@paragraph@mark\@empty \let\jsParagraphMark\@empty \else\ifx\bxjs@paragraph@mark\@undefined\else diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 990ecdbbb3b..72d6b301fd9 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} - [2017/09/09 v1.6 BXJS document classes] + [2017/09/24 v1.6a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -1485,7 +1485,8 @@ {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi -\newcommand\jsParagraphMark{\jsJaChar{■}} +\newcommand\jsParagraphMark{\relax\jsJaChar{■}} +\let\bxjs@org@paragraph@mark\jsParagraphMark \ifx\bxjs@paragraph@mark\@empty \let\jsParagraphMark\@empty \else\ifx\bxjs@paragraph@mark\@undefined\else -- cgit v1.2.3