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 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 29 +++++++- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 29 +++++++- .../tex/latex/bxjscls/bxjsja-minimal.def | 86 +++++++++++++++++++++- .../tex/latex/bxjscls/bxjsja-standard.def | 48 +++++++++++- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 29 +++++++- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 29 +++++++- 6 files changed, 235 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index af37716f58e..50b036892fe 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [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 @@ -363,6 +367,24 @@ \fi} \ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,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 @@ -1135,15 +1157,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}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index e524370fe84..47ce8753aba 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [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,twoside,onecolumn,titlepage,openright,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 @@ -1228,15 +1250,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}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index 14b0afb0539..19b07e0a31c 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-minimal.def} - [2015/09/07 v1.0b BXJS document classes] + [2015/11/21 v1.0d BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% @@ -51,7 +51,79 @@ \AtBeginDocument{% \ifx\familydefault\bxjs@@CSsfdefault#1\fi}% } +\def\jsLetHeadChar#1#2{% + \begingroup + \escapechar=`\\ % + \let\bxjs@tmpa={% brace-match-hack + \bxjs@let@hchar@exp#2}% + \endgroup + \let#1\bxjs@g@tmpa} +\def\bxjs@let@hchar@exp{% + \futurelet\@let@token\bxjs@let@hchar@exp@a} +\def\bxjs@let@hchar@exp@a{% + \bxjs@cond\ifcat\noexpand\@let@token\bgroup\fi{% 波括弧 + \bxjs@let@hchar@out\let\relax + }{\bxjs@cond\ifcat\noexpand\@let@token\@sptoken\fi{% 空白 + \bxjs@let@hchar@out\let\space% + }{\bxjs@cond\if\noexpand\@let@token\@backslashchar\fi{% バックスラッシュ + \bxjs@let@hchar@out\let\@backslashchar + }{\bxjs@let@hchar@exp@b}}}} +\def\bxjs@let@hchar@exp@b#1{% + \expandafter\bxjs@let@hchar@exp@c\string#1?\@nil#1} +\def\bxjs@let@hchar@exp@c#1#2\@nil{% + \bxjs@cond\if#1\@backslashchar\fi{% 制御綴 + \bxjs@cond\expandafter\ifx\noexpand\@let@token\@let@token\fi{% + \bxjs@let@hchar@out\let\relax + }{%else + \expandafter\bxjs@let@hchar@exp + }% + }{%else + \bxjs@let@hchar@chr#1% + }} +\def\bxjs@let@hchar@chr#1{% + \bxjs@let@hchar@out\def{{#1}}} +\def\bxjs@let@hchar@out#1#2{% + \global#1\bxjs@g@tmpa#2\relax + \toks@\bgroup}% skip to right brace +\chardef\bxjs@let@hchar@csta=128 +\chardef\bxjs@let@hchar@cstb=192 +\chardef\bxjs@let@hchar@cstc=224 +\chardef\bxjs@let@hchar@cstd=240 +\chardef\bxjs@let@hchar@cste=248 +\let\bxjs@let@hchar@chr@ue@a\bxjs@let@hchar@chr +\def\bxjs@let@hchar@chr@ue#1{% + \@tempcnta=`#1\relax + \bxjs@cond\ifnum\@tempcnta<\bxjs@let@hchar@csta\fi{% + \bxjs@let@hchar@chr@ue@a#1% + }{\bxjs@cond\ifnum\@tempcnta<\bxjs@let@hchar@cstb\fi{% + \bxjs@let@hchar@out\let\relax + }{\bxjs@cond\ifnum\@tempcnta<\bxjs@let@hchar@cstc\fi{% + \bxjs@let@hchar@chr@ue@b + }{\bxjs@cond\ifnum\@tempcnta<\bxjs@let@hchar@cstd\fi{% + \bxjs@let@hchar@chr@ue@c + }{\bxjs@cond\ifnum\@tempcnta<\bxjs@let@hchar@cste\fi{% + \bxjs@let@hchar@chr@ue@d + }{%else + \bxjs@let@hchar@out\let\relax + }}}}}} +\def\bxjs@let@hchar@chr@ue@a#1{% + \bxjs@let@hchar@out\def{{#1}}} +\def\bxjs@let@hchar@chr@ue@b#1#2{% + \bxjs@let@hchar@out\def{{#1#2}}} +\def\bxjs@let@hchar@chr@ue@c#1#2#3{% + \bxjs@let@hchar@out\def{{#1#2#3}}} +\def\bxjs@let@hchar@chr@ue@d#1#2#3#4{% + \bxjs@let@hchar@out\def{{#1#2#3#4}}} \ifx j\jsEngine +\def\bxjs@let@hchar@chr@pp#1{% + \expandafter\bxjs@let@hchar@chr@pp@a\meaning#1\relax#1} +\def\bxjs@let@hchar@chr@pp@a#1#2\relax#3{% + \bxjs@cond\if#1t\fi{% + \bxjs@let@hchar@chr@ue#3% + }{%else + \bxjs@let@hchar@out\def{{#3}}% + }} +\let\bxjs@let@hchar@chr\bxjs@let@hchar@chr@pp \edef\jsc@JYn{\ifjsWithupTeX JY2\else JY1\fi} \edef\jsc@JTn{\ifjsWithupTeX JT2\else JT1\fi} \edef\jsc@pfx@{\ifjsWithupTeX u\fi} @@ -133,6 +205,7 @@ \xspcode\@tempcnta=3\advance\@tempcnta\@ne} \let\jsInhibitGlueAtParTop\@inhibitglue \else\ifx p\jsEngine +\let\bxjs@let@hchar@chr\bxjs@let@hchar@chr@ue \@onlypreamble\bxjs@cjk@loaded \def\bxjs@cjk@loaded{% \def\@footnotemark{% @@ -155,7 +228,16 @@ \bxjs@cjk@loaded }{}% } -\fi\fi +\else\ifx x\jsEngine +\def\bxjs@let@hchar@chr#1{% + \@tempcnta`#1\relax \divide\@tempcnta"800\relax + \bxjs@cond\ifnum\@tempcnta=27 \fi{% + \bxjs@let@hchar@chr@xe + }{\bxjs@let@hchar@out\def{{#1}}}} +\def\bxjs@let@hchar@chr@xe#1{% + \lccode`0=`#1\relax + \lowercase{\bxjs@let@hchar@out\def{{0}}}} +\fi\fi\fi \endinput %% %% End of file `bxjsja-minimal.def'. diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 5b7bc161f36..b54778b84ac 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesFile{bxjsja-standard.def} - [2015/09/07 v1.0b BXJS document classes] + [2015/11/21 v1.0d BXJS document classes] \input{bxjsja-minimal.def} \ifjsWitheTeX \@tempdima=0.25mm @@ -153,6 +153,17 @@ \ifx$#1$\def\bxjs@tmpa{#2}% \else \let\bxjs@tmpa\relax \fi} +\def\jsJaChar#1{% + \begingroup + \jsLetHeadChar\bxjs@tmpa{#1}% + \ifx\bxjs@tmpa\relax + \ClassWarningNoLine\bxjs@clsname + {Illegal argument given to \string\jsJaChar}% + \else + \expandafter\bxjs@jachar\expandafter{\bxjs@tmpa}% + \fi + \endgroup} +\let\bxjs@jachar\@firstofone \PassOptionsToPackage{setpagesize=false}{hyperref} \@onlypreamble\bxjs@fix@hyperref@unicode \def\bxjs@fix@hyperref@unicode#1{% @@ -186,6 +197,34 @@ \kanjiskip\@tempskipa} \def\bxjs@apply@xkanjiskip{% \xkanjiskip\@tempskipa} +\def\bxjs@jachar#1{% + \bxjs@jachar@a#1....\@nil} +\def\bxjs@jachar@a#1#2#3#4#5\@nil{% + \ifx.#2#1% + \else\ifx.#3% + \@tempcnta`#1 \multiply\@tempcnta64 + \advance\@tempcnta`#2 \advance\@tempcnta-"3080 + \bxjs@jachar@b + \else\ifx.#4% + \@tempcnta`#1 \multiply\@tempcnta64 + \advance\@tempcnta`#2 \multiply\@tempcnta64 + \advance\@tempcnta`#3 \advance\@tempcnta-"E2080 + \bxjs@jachar@b + \else + \@tempcnta`#1 \multiply\@tempcnta64 + \advance\@tempcnta`#2 \multiply\@tempcnta64 + \advance\@tempcnta`#3 \multiply\@tempcnta64 + \advance\@tempcnta`#4 \advance\@tempcnta-"3C82080 + \bxjs@jachar@b + \fi\fi\fi} +\ifjsWithupTeX + \def\bxjs@jachar@b{\kchar\@tempcnta} +\else + \def\bxjs@jachar@b{% + \ifx\bxUInt\@undefined\else + \bxUInt{\@tempcnta}% + \fi} +\fi \let\bxjs@tmpa\jsJaFont \ifx\bxjs@tmpa\bxjs@@auto \let\bxjs@tmpa\@empty @@ -284,6 +323,8 @@ \def\bxjs@apply@xkanjiskip{% \jsXKanjiSkip\@tempskipa \let\CJKecglue\bxjs@CJKecglue} +\def\bxjs@jachar#1{% + \CJKforced{#1}} \else\if x\jsEngine \RequirePackage{zxjatype} \PassOptionsToPackage{no-math}{fontspec}%! @@ -325,6 +366,9 @@ \protected\def\mcfamily{\CJKfamily{\CJKrmdefault}} \protected\def\gtfamily{\CJKfamily{\CJKsfdefault}} \fi +\def\bxjs@jachar#1{% + \xeCJKDeclareCharClass{CJK}{`#1}\relax + #1} \else\if l\jsEngine \let\zw\@undefined \RequirePackage{luatexja} @@ -384,6 +428,8 @@ \ltjsetparameter{kanjiskip={\@tempskipa}}} \def\bxjs@apply@xkanjiskip{% \ltjsetparameter{xkanjiskip={\@tempskipa}}} +\def\bxjs@jachar#1{% + \ltjjachar`#1\relax} \fi\fi\fi\fi \DeclareJaTextFontCommand{\textmc}{\mcfamily} \DeclareJaTextFontCommand{\textgt}{\gtfamily} 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}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 60068d215c5..837f91222f8 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [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 @@ -363,6 +367,24 @@ \fi} \ExecuteOptions{36pt,a4paper,landscape,oneside,onecolumn,titlepage,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 @@ -1133,15 +1155,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