diff options
Diffstat (limited to 'macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty')
-rw-r--r-- | macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty | 151 |
1 files changed, 98 insertions, 53 deletions
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty index bfe092f80c..9208b09961 100644 --- a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty +++ b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty @@ -11,13 +11,23 @@ %% % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jpneduenumerate}[2022/07/09 v1.1] +\ProvidesPackage{jpneduenumerate}[2022/07/15 v1.2] % %% [lua] \newif\if@jpnedu@enumerate@lua \@jpnedu@enumerate@luafalse \DeclareOption{lua}{\@jpnedu@enumerate@luatrue}% % +%% [casebracket] +\newif\if@jpnedu@enumerate@casebracket +\@jpnedu@enumerate@casebracketfalse +\DeclareOption{casebracket}{\@jpnedu@enumerate@casebrackettrue}% +% +%% [stepbracket] +\newif\if@jpnedu@enumerate@stepbracket +\@jpnedu@enumerate@stepbracketfalse +\DeclareOption{stepbracket}{\@jpnedu@enumerate@stepbrackettrue}% +% \ExecuteOptions{} \ProcessOptions\relax % @@ -87,23 +97,20 @@ }% {\end{enumerate}} % -%% \begin{caseenumerate} -%% \begin{caseenumerate*} -%% \begin{stepenumerate} -%% \begin{stepenumerate*} -\newenvironment{caseenumerate}% -{\begin{romanenumerate}}% -{\end{romanenumerate}} -\newenvironment{caseenumerate*}% -{\begin{romanenumerate*}}% -{\end{romanenumerate*}} -\newenvironment{stepenumerate}% -{\begin{Romanenumerate}}% -{\end{Romanenumerate}} -\newenvironment{stepenumerate*}% -{\begin{Romanenumerate*}}% -{\end{Romanenumerate*}} -%% +%% \begin{bracketenumerate} +%% \begin{bracketenumerate*} +\newenvironment{bracketenumerate}% +{\begin{enumerate}[nosep,leftmargin=2\zw,itemindent=1\zw,labelsep=1.15\zw,listparindent=1\zw]% +\renewcommand{\labelenumi}{[\arabic{enumi}]}% +\renewcommand{\labelenumii}{[\alph{enumii}]}% +}% +{\end{enumerate}} +\newenvironment{bracketenumerate*}% +{\begin{enumerate}[nosep,leftmargin=3\zw,itemindent=0\zw,labelsep=1.15\zw]% +\renewcommand{\labelenumi}{[\arabic{enumi}]}% +\renewcommand{\labelenumii}{[\alph{enumii}]}% +}% +{\end{enumerate}} % %% \@jpneduenumerate@z@w@space \chardef\@jpneduenumerate@z@w@space=\jis"2121\relax @@ -178,23 +185,20 @@ }% {\end{enumerate}} % -%% \begin{caseenumerate} -%% \begin{caseenumerate*} -%% \begin{stepenumerate} -%% \begin{stepenumerate*} -\newenvironment{caseenumerate}% -{\begin{romanenumerate}}% -{\end{romanenumerate}} -\newenvironment{caseenumerate*}% -{\begin{romanenumerate*}}% -{\end{romanenumerate*}} -\newenvironment{stepenumerate}% -{\begin{Romanenumerate}}% -{\end{Romanenumerate}} -\newenvironment{stepenumerate*}% -{\begin{Romanenumerate*}}% -{\end{Romanenumerate*}} -%% +%% \begin{bracketenumerate} +%% \begin{bracketenumerate*} +\newenvironment{bracketenumerate}% +{\begin{enumerate}[nosep,leftmargin=2zw,itemindent=1zw,labelsep=1.15zw,listparindent=1zw]% +\renewcommand{\labelenumi}{[\arabic{enumi}]}% +\renewcommand{\labelenumii}{[\alph{enumii}]}% +}% +{\end{enumerate}} +\newenvironment{bracketenumerate*}% +{\begin{enumerate}[nosep,leftmargin=3zw,itemindent=0zw,labelsep=1.15zw]% +\renewcommand{\labelenumi}{[\arabic{enumi}]}% +\renewcommand{\labelenumii}{[\alph{enumii}]}% +}% +{\end{enumerate}} % %% \@jpneduenumerate@makenumber % Non-stared macros are heading ones. @@ -213,6 +217,41 @@ \fi %%%%%%%%%%%%%%%%%%%%%%%% % +%% \begin{caseenumerate} +%% \begin{caseenumerate*} +%% \begin{stepenumerate} +%% \begin{stepenumerate*} +\if@jpnedu@enumerate@casebracket +\newenvironment{caseenumerate}% +{\begin{bracketenumerate}}% +{\end{bracketenumerate}} +\newenvironment{caseenumerate*}% +{\begin{bracketenumerate*}}% +{\end{bracketenumerate*}} +\else +\newenvironment{caseenumerate}% +{\begin{romanenumerate}}% +{\end{romanenumerate}} +\newenvironment{caseenumerate*}% +{\begin{romanenumerate*}}% +{\end{romanenumerate*}} +\fi +\if@jpnedu@enumerate@stepbracket +\newenvironment{stepenumerate}% +{\begin{bracketenumerate}}% +{\end{bracketenumerate}} +\newenvironment{stepenumerate*}% +{\begin{bracketenumerate*}}% +{\end{bracketenumerate*}} +\else +\newenvironment{stepenumerate}% +{\begin{Romanenumerate}}% +{\end{Romanenumerate}} +\newenvironment{stepenumerate*}% +{\begin{Romanenumerate*}}% +{\end{Romanenumerate*}} +\fi +% %% \@jpneduenumerate@z@w@space \chardef\@jpneduenumerate@z@w@space=\jis"2121\relax % @@ -223,6 +262,7 @@ \@jpneduenumerate@makenumber{parenromanref}{(\ajroman{\getrefnumber{#1}})} \@jpneduenumerate@makenumber{Romanref}{\ajRoman{\getrefnumber{#1}}} \@jpneduenumerate@makenumber{parenRomanref}{(\ajRoman{\getrefnumber{#1}})} +\@jpneduenumerate@makenumber{bracketref}{[\ref{#1}]} % %%* ENUMERATE GENERATOR %% \@jpneduenumeratetext@makenumber @@ -277,20 +317,12 @@ \@jpneduenumeratetext@makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate@z@w@space}} \@jpneduenumeratetext@makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate@z@w@space}} % NG: \mbox{(#1)} -\@jpneduenumeratetext@makenumber{subquestion}{\:(#1)} -\@jpneduenumeratetext@makenumber{enumerate}{\:(#1)} -\@jpneduenumeratetext@makenumber{case}{\mbox{(\ajroman{#1})}} -\@jpneduenumeratetext@makenumber{step}{\mbox{(\ajRoman{#1})}} %% % %% Refs \@jpneduenumerate@makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}} \@jpneduenumerate@makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}} % \@jpneduenumerate@makenumber{questionref}{\mbox{\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.3em]{\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}} -\@jpneduenumerate@makenumber{subquestionref}{\:\mbox{(\ref{#1})}} -\@jpneduenumerate@makenumber{enumerateref}{\:\mbox{(\ref{#1})}} -\@jpneduenumerate@makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}} -\@jpneduenumerate@makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}} % %%%%%%%%%%%%%%%%%%%%%%%% % without [lua] %%%%%%%% @@ -302,20 +334,12 @@ \@jpneduenumeratetext@makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@z@w@space}} \@jpneduenumeratetext@makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@z@w@space}} % NG: \mbox{(#1)} -\@jpneduenumeratetext@makenumber{subquestion}{\:(#1)} -\@jpneduenumeratetext@makenumber{enumerate}{\:(#1)} -\@jpneduenumeratetext@makenumber{case}{\mbox{(\ajroman{#1})}} -\@jpneduenumeratetext@makenumber{step}{\mbox{(\ajRoman{#1})}} %% % %% Refs \@jpneduenumerate@makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}} \@jpneduenumerate@makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}} % \@jpneduenumerate@makenumber{questionref}{\mbox{\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.3em]{\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}} -\@jpneduenumerate@makenumber{subquestionref}{\:\mbox{(\ref{#1})}} -\@jpneduenumerate@makenumber{enumerateref}{\:\mbox{(\ref{#1})}} -\@jpneduenumerate@makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}} -\@jpneduenumerate@makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}} % %%%%%%%%%%%%%%%%%%%%%%%% % common %%%%%%%%%%%%%%% @@ -323,6 +347,18 @@ \fi %%%%%%%%%%%%%%%%%%%%%%%% % +\@jpneduenumeratetext@makenumber{subquestion}{\:(#1)} +\@jpneduenumeratetext@makenumber{enumerate}{\:(#1)} +\@jpneduenumerate@makenumber{subquestionref}{\:\mbox{(\ref{#1})}} +\@jpneduenumerate@makenumber{enumerateref}{\:\mbox{(\ref{#1})}} +% +\if@jpnedu@enumerate@casebracket +\@jpneduenumeratetext@makenumber{case}{\:[#1]} +\@jpneduenumerate@makenumber{caseref}{\:\mbox{[\ref{#1}]}} +\else +\@jpneduenumeratetext@makenumber{case}{\mbox{(\ajroman{#1})}} +\@jpneduenumerate@makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}} +% %%* AVOID ERROR of COUNTER %% case \renewcommand{\caseauto}{\@ifstar{\@jpneduenumeratetext@avoid@caseauto@star}{\@jpneduenumeratetext@avoid@caseauto@nostar}} @@ -341,8 +377,16 @@ \newcommand{\@jpneduenumeratetext@avoid@casekeep@nostar}{% \casenumber{\value{jpneduenumeratetextcasecounter}}% } -%% % +\fi +\if@jpnedu@enumerate@stepbracket +\@jpneduenumeratetext@makenumber{step}{\:[#1]} +\@jpneduenumerate@makenumber{stepref}{\:\mbox{[\ref{#1}]}} +\else +\@jpneduenumeratetext@makenumber{step}{\mbox{(\ajRoman{#1})}} +\@jpneduenumerate@makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}} +% +%%* AVOID ERROR of COUNTER %% step \renewcommand{\stepauto}{\@ifstar{\@jpneduenumeratetext@avoid@stepauto@star}{\@jpneduenumeratetext@avoid@stepauto@nostar}} \newcommand{\@jpneduenumeratetext@avoid@stepauto@star}{% @@ -360,7 +404,8 @@ \newcommand{\@jpneduenumeratetext@avoid@stepkeep@nostar}{% \stepnumber{\value{jpneduenumeratetextstepcounter}}% } -%% +\fi +% %%* % %% \equationreset |