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/bxjsja-pandoc.def | 41 +++++++++------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def') 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'. -- cgit v1.2.3