From 8c965e5ca448a84cc51fea64d297cdcf00c4a1f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 21 Oct 2017 21:37:58 +0000 Subject: bxjscls (21oct17) git-svn-id: svn://tug.org/texlive/trunk@45566 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 44 +++++++++++++++++------ 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 72d6b301fd9..3227f3b19ee 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/24 v1.6a BXJS document classes] + [2017/10/21 v1.7 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -541,14 +541,27 @@ \let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue \let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse \define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}} -\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue -\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue -\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse -\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}} +\newif\ifbxjs@jaspace@cmd \bxjs@jaspace@cmdtrue +\let\bxjs@kv@jaspacecmd@true\bxjs@jaspace@cmdtrue +\let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse +\define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} +\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse \define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}} +\chardef\bxjs@everyparhook@none=0 +\chardef\bxjs@everyparhook@compat=1 +\chardef\bxjs@everyparhook@modern=2 +\if j\jsEngine + \let\bxjs@everyparhook\bxjs@everyparhook@compat +\else + \let\bxjs@everyparhook\bxjs@everyparhook@modern +\fi +\def\bxjs@kv@everyparhook@none{\let\bxjs@everyparhook\bxjs@everyparhook@none} +\def\bxjs@kv@everyparhook@compat{\let\bxjs@everyparhook\bxjs@everyparhook@compat} +\def\bxjs@kv@everyparhook@modern{\let\bxjs@everyparhook\bxjs@everyparhook@modern} +\define@key{bxjs}{everyparhook}{\bxjs@set@keyval{everyparhook}{#1}{}} \let\bxjs@ltx@removeelement\@removeelement \def\@removeelement#1#2#3{% \def\reserved@a{#2}% @@ -1321,6 +1334,10 @@ \@ifstar {\@ssect{#3}{#4}{#5}{#6}}% {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}} +\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat + \let\bxjs@if@ceph\@firstofone +\else \let\bxjs@if@ceph\@gobble +\fi \def\@sect#1#2#3#4#5#6[#7]#8{% \ifnum #2>\c@secnumdepth \let\@svsec\@empty @@ -1368,11 +1385,10 @@ \unskip \@tempskipa #1\relax \hskip -\@tempskipa - \bxjs@ltj@inhibitglue \else \clubpenalty \@clubpenalty - \everypar{\everyparhook}% - \fi\everyparhook}% + \everypar\expandafter{\bxjs@if@ceph\everyparhook}% + \fi\bxjs@if@ceph\everyparhook}% \else \par \nobreak \vskip \@tempskipa @@ -1397,7 +1413,6 @@ \endgroup \fi \@xsect{#3}} -\let\bxjs@ltj@inhibitglue\@empty \newcommand*\chaptermark[1]{} \setcounter{secnumdepth}{3} \newcounter{part} @@ -1987,7 +2002,10 @@ \llap{\@makefnmark\hskip0.3\jsZw}#1} \let\jsInhibitGlueAtParTop\@empty \def\everyparhook{\jsInhibitGlueAtParTop} +\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat \AtBeginDocument{\everypar{\everyparhook}} +\fi +\ifx j\jsEngine \def\@inhibitglue{% \futurelet\@let@token\@@inhibitglue} \begingroup @@ -2015,6 +2033,8 @@ \inhibitglue \fi \fi} +\fi +\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat \def\@doendpe{% \@endpetrue \def\par{% @@ -2067,7 +2087,6 @@ \clubpenalty \@clubpenalty \everypar{\everyparhook}% \fi - \bxjs@ltj@inhibitglue \everyparhook}% \if@noitemarg \@noitemargfalse @@ -2101,6 +2120,9 @@ \clubpenalty \@clubpenalty \everypar{\everyparhook}% \fi\everyparhook}} +\fi +\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none\else +\AtEndOfPackage{% \def\@gnewline #1{% \ifvmode \@nolnerr @@ -2108,6 +2130,8 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \jsInhibitGlue \ignorespaces \fi} +} +\fi \if@jslogo \IfFileExists{jslogo.sty}{% \RequirePackage{jslogo}% -- cgit v1.2.3