From b019d15db444b32288a5d65981d31fbf283b9f25 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 21 Nov 2015 22:29:46 +0000 Subject: bxjscls (20nov15) git-svn-id: svn://tug.org/texlive/trunk@38915 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index e7471f4f192..6234844f826 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2015/09/07 v1.0b BXJS document classes] + [2015/11/21 v1.0d BXJS document classes] \RequirePackage{calc} \RequirePackage{keyval} \let\jsEngine=n @@ -69,6 +69,10 @@ \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@ \jsInPdfModetrue \fi\fi +\@gobbletwo\if\if \def\bxjs@cond#1\fi{% + #1\expandafter\@firstoftwo + \else\expandafter\@secondoftwo + \fi} \let\jsArticle=a \let\jsBook=b \let\jsReport=r @@ -367,6 +371,24 @@ \fi} \ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final} \ProcessOptions\relax +\@onlypreamble\bxjs@purge@brace@elts +\def\bxjs@purge@brace@elts{% + \def\bxjs@tmpa{\@gobble}% + \expandafter\bxjs@purge@be@a\@classoptionslist,\@nil,% + \let\@classoptionslist\bxjs@tmpa} +\@onlypreamble\bxjs@purge@be@a +\def\bxjs@purge@be@a#1,{% + \ifx\@nil#1\relax\else + \bxjs@purge@be@b#1{}\@nil + \if@tempswa \edef\bxjs@tmpa{\bxjs@tmpa,#1}\fi + \expandafter\bxjs@purge@be@a + \fi} +\@onlypreamble\bxjs@purge@be@b +\def\bxjs@purge@be@b#1#{\bxjs@purge@be@c} +\@onlypreamble\bxjs@purge@be@c +\def\bxjs@purge@be@c#1\@nil{% + \ifx\@nil#1\@nil \@tempswatrue \else \@tempswafalse \fi} +\bxjs@purge@brace@elts \@expandtwoargs\@removeelement {papersize}\@classoptionslist\@classoptionslist \@expandtwoargs\@removeelement @@ -1224,15 +1246,16 @@ {\z@}% {\normalfont\normalsize\headfont}} \fi +\newcommand\jsParagraphMark{\jsJaChar{■}} \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {\z@}{-1\jsZw}% 改行せず 1\jsZw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% {-1\jsZw}% 改行せず 1\jsZw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \fi \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {\z@}{-1\jsZw}% -- cgit v1.2.3