texlive[63893] Master/texmf-dist: jpneduenumerate (14jul22)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 14 22:18:51 CEST 2022
Revision: 63893
http://tug.org/svn/texlive?view=revision&revision=63893
Author: karl
Date: 2022-07-14 22:18:51 +0200 (Thu, 14 Jul 2022)
Log Message:
-----------
jpneduenumerate (14jul22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jpneduenumerate/README.md
trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.pdf
trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.tex
trunk/Master/texmf-dist/tex/latex/jpneduenumerate/jpneduenumerate.sty
Modified: trunk/Master/texmf-dist/doc/latex/jpneduenumerate/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jpneduenumerate/README.md 2022-07-14 20:18:31 UTC (rev 63892)
+++ trunk/Master/texmf-dist/doc/latex/jpneduenumerate/README.md 2022-07-14 20:18:51 UTC (rev 63893)
@@ -2,7 +2,9 @@
Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces enumerative expressions in Japanese education.
+The term "in Japanese education" here refers to the results of my own survey of representations in authorized textbooks for high schools of several companies.
+
## Documents
Documents for this package are available in English and Japanese.
@@ -17,6 +19,11 @@
## Revision History
++ Version 1.2 2022-07-15
+ + Improve README.
+ + Improve the documentation.
+ + Add the [casebracket] and [stepbracket] option.
+ + Add the bracketenumerate environment.
+ Version 1.1 2022-07-09
+ Rewrite README.
+ Add the document (jpneduenumerate.pdf).
Modified: trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.tex 2022-07-14 20:18:31 UTC (rev 63892)
+++ trunk/Master/texmf-dist/doc/latex/jpneduenumerate/jpneduenumerate.tex 2022-07-14 20:18:51 UTC (rev 63893)
@@ -151,9 +151,11 @@
\begin{translateing}
Mathematical equation representation in Japanese education differs somewhat from the standard \LaTeX\ writing style.
This package introduces enumerative expressions in Japanese education.
+The term ``in Japanese education'' here refers to the results of my own survey of representations in authorized textbooks for high schools of several companies.
日本の教育における数式表現には，\LaTeX の標準である書きかたとはやや異なる部分があります。
このパッケージでは，日本の教育における列挙表現を導入します。
+なお，ここでの「日本の教育における」とは，数社の高等学校の検定済み教科書における表記を独自に調査した結果により述べています。
\end{translateing}
\psuedocontents{Requirements}{System Requirements}{前提条件}
@@ -166,6 +168,8 @@
\psuedocontents{moreinfo}{For More Information}{問い合わせ・詳しくは}
+\newpage
+\vspace*{-1.8\baselineskip}
\psuedosection{Requirements}{System Requirements}{前提条件}
\begin{translateing}
@@ -207,17 +211,21 @@
%\end{translateing}
%\begin{translateing}
-There are the |[lua]| options:
-This option changes the engine this package runs on from \pTeX/\upTeX\ to \LuaTeX. It does not change the appearance of the output.
+There are the three options:\\
+\textbullet\ |[casebracket]|/|[stepbracket]| change \\|case|/|step| |enumerate|, |auto|, |keep|, |reset|, |ref| to square bracket (as [1]).\\
+\textbullet\ |[lua]| changes the engine this package runs on from \pTeX/\upTeX\ to \LuaTeX. It does not change the appearance of the output.
Since the unit |zw| is used when no options are loaded, it can be used only in the \pTeX/\upTeX\ series.
Since the unit |\zw| is used when the \code{[lua]} loaded, it can be used only in the \LuaTeX\ series and \LuaTeX-ja.
-|[lua]| オプションがあります。
-このオプションは，このパッケージが動作するエンジンを\pTeX/\upTeX から\LuaTeX に変更します。それは出力の見た目には変化を及ぼしません。
+3つのオプションがあります。\\
+\textbullet\ |[casebracket]|/|[stepbracket]|は\\|case|/|step|環境，|auto|，|keep|，|reset|，|ref|を角括弧に変えます（[1]のように）。\\
+\textbullet\ |lua|は，このパッケージが動作するエンジンを\pTeX/\upTeX から\LuaTeX に変更します。それは出力の見た目には変化を及ぼしません。
オプションを使用しないときには単位|zw|を用いますので，\pTeX/\upTeX 系列でのみ使用できます。
\code{[lua]}を読み込むと単位\commandtojskip|\zw|を用いますので，\LuaTeX 系列でのみ使用できます。
\end{translateing}
+\newpage
+\vspace*{-1\baselineskip}
\psuedosection{Usage}{Usage}{使用方法}
\macroexplanation{astarisked environments}
@@ -230,15 +238,12 @@
たとえば，次のようになります。
\end{translateing}
-\newpage
-
\noindent\hspace*{\fill}\fbox{\parbox{0.625\textwidth}{%
\ttfamily\textbackslash begin\{itemize\}\\
\textbackslash item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。\\
\textbackslash item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。\\
-\textbackslash end\{itemize\}
-
-\linespace*
+\textbackslash end\{itemize\}\\
+%\linespace*
\textbackslash begin\{itemize*\}\\
\textbackslash item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。\\
\textbackslash item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。\\
@@ -251,7 +256,6 @@
\item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。
\item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。
\end{itemize}
-
\begin{itemize*}
\item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。
\item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。
@@ -266,6 +270,7 @@
欧文のもとでこのパッケージを使用しても，同じ大きさすなわち全角１文字分の|parindent|が設定されます。
\end{translateing}
+\newpage
\macroexplanation{environment enumerate and itemize}
\begin{translateing}
@@ -278,56 +283,95 @@
例は直前のものを見てください。
\end{translateing}
-\newpage
-\macroexplanation{environment romanenumerate and caseenumerate}
+\macroexplanation{environment caseenumerate}
\begin{translateing}
+If |[casebracket]| is not loaded, |caseenumerate| is an alias for |romanenumerate|.
+If |[casebracket]| is loaded, |caseenumerate| is an alias for |bracketenumerate|.
+The appearance is shown below.
+
+|[casebracket]|を読み込んでいなければ，|caseenumerate|は|romanenumerate|の別名です。
+|[casebracket]|を読み込んでいれば，|caseenumerate|は|bracketenumerate|の別名です。見た目は次に載せます。
+\end{translateing}
+
+\macroexplanation{environment stepenumerate}
+
+\begin{translateing}
+If |[stepbracket]| is not loaded, |stepenumerate| is an alias for |Romanenumerate|.
+If |stepbracket| is loaded, |stepenumerate| is an alias for |bracketenumerate|.
+The appearance is shown below.
+
+|[stepbracket]|を読み込んでいなければ，|stepenumerate|は|Romanenumerate|の別名です。
+|[stepbracket]|を読み込んでいれば，|stepenumerate|は|bracketenumerate|の別名です。見た目は次に載せます。
+\end{translateing}
+
+\macroexplanation{environment romanenumerate}
+
+\begin{translateing}
This environment replaces the symbols in the |enumerate| environment with a full-width (i).
-|caseenumerate| is synonym for |romanenumerate|.
この環境は|enumerate|環境の記号を全角の(i)に置き換えたものです。
-|caseenumerate|は|romanenumerate|の別名です。
\end{translateing}
\begin{lstlisting}
-\begin{caseenumerate}
+\begin{romanenumerate}
\item The best and most beautiful things in the world cannot be seen or even touched.
\item They must be felt with the heart.
-\end{caseenumerate}
+\end{romanenumerate}
\end{lstlisting}
\begin{macroexample}
-\begin{caseenumerate}
+\begin{romanenumerate}
\item The best and most beautiful things in the world cannot be seen or even touched.
\item They must be felt with the heart.
-\end{caseenumerate}
+\end{romanenumerate}
\end{macroexample}
-\macroexplanation{environment Romanenumerate and stepenumerate}
+\newpage
+\macroexplanation{environment Romanenumerate}
\begin{translateing}
This environment replaces the symbols in the |enumerate| environment with a full-width (I).
-|stepenumerate| is synonym for |Romanenumerate|.
この環境は|enumerate|環境の記号を全角の(I)に置き換えたものです。
-|stepenumerate|は|Romanenumerate|の別名です。
\end{translateing}
\begin{lstlisting}
-\begin{stepenumerate}
+\begin{Romanenumerate}
\item The best and most beautiful things in the world cannot be seen or even touched.
\item They must be felt with the heart.
-\end{stepenumerate}
+\end{Romanenumerate}
\end{lstlisting}
\begin{macroexample}
-\begin{stepenumerate}
+\begin{Romanenumerate}
\item The best and most beautiful things in the world cannot be seen or even touched.
\item They must be felt with the heart.
-\end{stepenumerate}
+\end{Romanenumerate}
\end{macroexample}
-\newpage
+\macroexplanation{environment bracketenumerate}
+
+\begin{translateing}
+This environment replaces the symbols in the |enumerate| environment with [1].
+
+この環境は|enumerate|環境の記号を[1]に置き換えたものです。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{bracketenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{bracketenumerate}
+\end{lstlisting}
+
+\begin{macroexample}
+\begin{bracketenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{bracketenumerate}
+\end{macroexample}
+
\macroexplanation{\parenref{<label>}}
\begin{translateing}
@@ -344,6 +388,7 @@
ラベルによって\ajroman{1}のように参照します。
\end{translateing}
+\newpage
\macroexplanation{\parenromanref{<label>}}
\begin{translateing}
@@ -368,6 +413,15 @@
ラベルによって(\ajRoman{1})のように参照します。
\end{translateing}
+\macroexplanation{\bracketref{<label>}}
+
+\begin{translateing}
+Referred to as [1] depending on the label.
+
+ラベルによって[1]のように参照します。
+\end{translateing}
+
+
\begin{lstlisting}
\begin{enumerate}
\item The best and most beautiful things in the world cannot be seen or even touched.\label{A}
@@ -379,6 +433,7 @@
\parenromanref{A}\parenromanref{B}
\Romanref{A}\Romanref{B}
\parenRomanref{A}\parenRomanref{B}
+\bracketref{A}\bracketref{B}
\end{lstlisting}
\begin{macroexample}
@@ -391,7 +446,7 @@
\romanref{A}\romanref{B}
\parenromanref{A}\parenromanref{B}
\Romanref{A}\Romanref{B}
-\parenRomanref{A}\parenRomanref{B}
+\bracketref{A}\bracketref{B}
\end{macroexample}
\begin{translateing}
@@ -399,9 +454,9 @@
ラベルは数字しか管理していないので，見た目はrefの種類を変えることで実現します。
-As in the example above, these commands except |\parenref| disable |hyperref|.
+As in the example above, these commands except |\parenref| and |\bracketref| disable |hyperref|.
-上の例で分かる通り，|\parenref|以外のこれらのコマンドは|hyperref|を無効にします。
+上の例で分かる通り，|\parenref|と|\bracketref|以外のこれらのコマンドは|hyperref|を無効にします。
\end{translateing}
\newpage
@@ -417,8 +472,8 @@
\textbullet\ |square| or |question| (\squarenumber*{1})\\
\textbullet\ |enumerate| (1)\\
\textbullet\ |subquestion| (1)\\
-\textbullet\ |case| (\ajroman{1})\\
-\textbullet\ |step| (\ajRoman{1})
+\textbullet\ |case| (\ajroman{1}) / [1] (with |[casebracket]|)\\
+\textbullet\ |step| (\ajRoman{1}) / [1] (with |[stepbracket]|)
|\??auto|は自動で番号が進む見出しを出力します。
|\??keep|は直前の番号のままで見出しを出力します。
@@ -428,8 +483,8 @@
\textbullet\ |square|または|question| （\squarenumber*{1}）\\
\textbullet\ |enumerate| (1)\\
\textbullet\ |subquestion| (1)\\
-\textbullet\ |case| (\ajroman{1})\\
-\textbullet\ |step| (\ajRoman{1})
+\textbullet\ |case| (\ajroman{1}) / [1]（|[casebracket]|読込時）\\
+\textbullet\ |step| (\ajRoman{1}) / [1]（|[casebracket]|読込時）
Non-asterisked commands are heading.
Asterisked commands are not heading.
Modified: trunk/Master/texmf-dist/tex/latex/jpneduenumerate/jpneduenumerate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jpneduenumerate/jpneduenumerate.sty 2022-07-14 20:18:31 UTC (rev 63892)
+++ trunk/Master/texmf-dist/tex/latex/jpneduenumerate/jpneduenumerate.sty 2022-07-14 20:18:51 UTC (rev 63893)
@@ -11,7 +11,7 @@
%%
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jpneduenumerate}[2022/07/09 v1.1]
+\ProvidesPackage{jpneduenumerate}[2022/07/15 v1.2]
%
%% [lua]
\newif\if at jpnedu@enumerate at lua
@@ -18,6 +18,16 @@
\@jpnedu at enumerate@luafalse
\DeclareOption{lua}{\@jpnedu at enumerate@luatrue}%
%
+%% [casebracket]
+\newif\if at jpnedu@enumerate at casebracket
+\@jpnedu at enumerate@casebracketfalse
+\DeclareOption{casebracket}{\@jpnedu at enumerate@casebrackettrue}%
+%
+%% [stepbracket]
+\newif\if at jpnedu@enumerate at stepbracket
+\@jpnedu at enumerate@stepbracketfalse
+\DeclareOption{stepbracket}{\@jpnedu at 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 at z@w at space
\chardef\@jpneduenumerate at z@w at 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 at makenumber
% Non-stared macros are heading ones.
@@ -213,6 +217,41 @@
\fi
%%%%%%%%%%%%%%%%%%%%%%%%
%
+%% \begin{caseenumerate}
+%% \begin{caseenumerate*}
+%% \begin{stepenumerate}
+%% \begin{stepenumerate*}
+\if at jpnedu@enumerate at 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 at jpnedu@enumerate at 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 at z@w at space
\chardef\@jpneduenumerate at z@w at space=\jis"2121\relax
%
@@ -223,6 +262,7 @@
\@jpneduenumerate at makenumber{parenromanref}{(\ajroman{\getrefnumber{#1}})}
\@jpneduenumerate at makenumber{Romanref}{\ajRoman{\getrefnumber{#1}}}
\@jpneduenumerate at makenumber{parenRomanref}{(\ajRoman{\getrefnumber{#1}})}
+\@jpneduenumerate at makenumber{bracketref}{[\ref{#1}]}
%
%%* ENUMERATE GENERATOR
%% \@jpneduenumeratetext at makenumber
@@ -277,10 +317,6 @@
\@jpneduenumeratetext at makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate at z@w at space}}
\@jpneduenumeratetext at makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate at z@w at space}}
% NG: \mbox{(#1)}
-\@jpneduenumeratetext at makenumber{subquestion}{\:(#1)}
-\@jpneduenumeratetext at makenumber{enumerate}{\:(#1)}
-\@jpneduenumeratetext at makenumber{case}{\mbox{(\ajroman{#1})}}
-\@jpneduenumeratetext at makenumber{step}{\mbox{(\ajRoman{#1})}}
%%
%
%% Refs
@@ -287,10 +323,6 @@
\@jpneduenumerate at makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate at z@w at space}}
\@jpneduenumerate at makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate at z@w at space}}
% \@jpneduenumerate at makenumber{questionref}{\mbox{\@jpneduenumerate at z@w at space\kern-1\zw\framebox[1.3em]{\ref{#1}}\kern-1\zw\@jpneduenumerate at z@w at space}}
-\@jpneduenumerate at makenumber{subquestionref}{\:\mbox{(\ref{#1})}}
-\@jpneduenumerate at makenumber{enumerateref}{\:\mbox{(\ref{#1})}}
-\@jpneduenumerate at makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}}
-\@jpneduenumerate at makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}}
%
%%%%%%%%%%%%%%%%%%%%%%%%
% without [lua] %%%%%%%%
@@ -302,10 +334,6 @@
\@jpneduenumeratetext at makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate at z@w at space}}
\@jpneduenumeratetext at makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate at z@w at space}}
% NG: \mbox{(#1)}
-\@jpneduenumeratetext at makenumber{subquestion}{\:(#1)}
-\@jpneduenumeratetext at makenumber{enumerate}{\:(#1)}
-\@jpneduenumeratetext at makenumber{case}{\mbox{(\ajroman{#1})}}
-\@jpneduenumeratetext at makenumber{step}{\mbox{(\ajRoman{#1})}}
%%
%
%% Refs
@@ -312,10 +340,6 @@
\@jpneduenumerate at makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate at z@w at space}}
\@jpneduenumerate at makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate at z@w at space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate at z@w at space}}
% \@jpneduenumerate at makenumber{questionref}{\mbox{\@jpneduenumerate at z@w at space\kern-1zw\framebox[1.3em]{\ref{#1}}\kern-1zw\@jpneduenumerate at z@w at space}}
-\@jpneduenumerate at makenumber{subquestionref}{\:\mbox{(\ref{#1})}}
-\@jpneduenumerate at makenumber{enumerateref}{\:\mbox{(\ref{#1})}}
-\@jpneduenumerate at makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}}
-\@jpneduenumerate at makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}}
%
%%%%%%%%%%%%%%%%%%%%%%%%
% common %%%%%%%%%%%%%%%
@@ -323,6 +347,18 @@
\fi
%%%%%%%%%%%%%%%%%%%%%%%%
%
+\@jpneduenumeratetext at makenumber{subquestion}{\:(#1)}
+\@jpneduenumeratetext at makenumber{enumerate}{\:(#1)}
+\@jpneduenumerate at makenumber{subquestionref}{\:\mbox{(\ref{#1})}}
+\@jpneduenumerate at makenumber{enumerateref}{\:\mbox{(\ref{#1})}}
+%
+\if at jpnedu@enumerate at casebracket
+\@jpneduenumeratetext at makenumber{case}{\:[#1]}
+\@jpneduenumerate at makenumber{caseref}{\:\mbox{[\ref{#1}]}}
+\else
+\@jpneduenumeratetext at makenumber{case}{\mbox{(\ajroman{#1})}}
+\@jpneduenumerate at makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}}
+%
%%* AVOID ERROR of COUNTER
%% case
\renewcommand{\caseauto}{\@ifstar{\@jpneduenumeratetext at avoid@caseauto at star}{\@jpneduenumeratetext at avoid@caseauto at nostar}}
@@ -341,8 +377,16 @@
\newcommand{\@jpneduenumeratetext at avoid@casekeep at nostar}{%
\casenumber{\value{jpneduenumeratetextcasecounter}}%
}
-%%
%
+\fi
+\if at jpnedu@enumerate at stepbracket
+\@jpneduenumeratetext at makenumber{step}{\:[#1]}
+\@jpneduenumerate at makenumber{stepref}{\:\mbox{[\ref{#1}]}}
+\else
+\@jpneduenumeratetext at makenumber{step}{\mbox{(\ajRoman{#1})}}
+\@jpneduenumerate at makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}}
+%
+%%* AVOID ERROR of COUNTER
%% step
\renewcommand{\stepauto}{\@ifstar{\@jpneduenumeratetext at avoid@stepauto at star}{\@jpneduenumeratetext at avoid@stepauto at nostar}}
\newcommand{\@jpneduenumeratetext at avoid@stepauto at star}{%
@@ -360,7 +404,8 @@
\newcommand{\@jpneduenumeratetext at avoid@stepkeep at nostar}{%
\stepnumber{\value{jpneduenumeratetextstepcounter}}%
}
-%%
+\fi
+%
%%*
%
%% \equationreset
More information about the tex-live-commits
mailing list.