From 672664411215c14fc71db763da169731d3c6a361 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 15 Jul 2022 03:01:16 +0000 Subject: CTAN sync 202207150301 --- macros/latex/contrib/fixdif/fixdif.dtx | 82 +- macros/latex/contrib/fixdif/fixdif.pdf | Bin 314029 -> 330827 bytes macros/latex/contrib/jpneduenumerate/README.md | 7 + .../contrib/jpneduenumerate/jpneduenumerate.pdf | Bin 153607 -> 161713 bytes .../contrib/jpneduenumerate/jpneduenumerate.sty | 151 +- .../contrib/jpneduenumerate/jpneduenumerate.tex | 121 +- macros/latex/contrib/l3kernel/CHANGELOG.md | 8 +- macros/latex/contrib/l3kernel/README.md | 2 +- macros/latex/contrib/l3kernel/expl3.dtx | 4 +- macros/latex/contrib/l3kernel/expl3.pdf | Bin 625919 -> 626032 bytes macros/latex/contrib/l3kernel/interface3.pdf | Bin 1768279 -> 1768454 bytes macros/latex/contrib/l3kernel/interface3.tex | 2 +- macros/latex/contrib/l3kernel/l3basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3bootstrap.dtx | 2 +- macros/latex/contrib/l3kernel/l3box.dtx | 2 +- macros/latex/contrib/l3kernel/l3candidates.dtx | 2 +- macros/latex/contrib/l3kernel/l3cctab.dtx | 2 +- macros/latex/contrib/l3kernel/l3clist.dtx | 2 +- macros/latex/contrib/l3kernel/l3coffins.dtx | 2 +- macros/latex/contrib/l3kernel/l3color.dtx | 2 +- macros/latex/contrib/l3kernel/l3debug.dtx | 2 +- macros/latex/contrib/l3kernel/l3deprecation.dtx | 2 +- macros/latex/contrib/l3kernel/l3doc.dtx | 2 +- macros/latex/contrib/l3kernel/l3doc.pdf | Bin 557804 -> 557944 bytes macros/latex/contrib/l3kernel/l3docstrip.dtx | 2 +- macros/latex/contrib/l3kernel/l3docstrip.pdf | Bin 151561 -> 151659 bytes macros/latex/contrib/l3kernel/l3expan.dtx | 2 +- macros/latex/contrib/l3kernel/l3file.dtx | 2 +- macros/latex/contrib/l3kernel/l3flag.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-assign.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-aux.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-expo.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-extended.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-logic.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-parse.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-random.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-round.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-traps.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-trig.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp.dtx | 2 +- macros/latex/contrib/l3kernel/l3fparray.dtx | 2 +- macros/latex/contrib/l3kernel/l3int.dtx | 2 +- macros/latex/contrib/l3kernel/l3intarray.dtx | 2 +- .../latex/contrib/l3kernel/l3kernel-functions.dtx | 2 +- macros/latex/contrib/l3kernel/l3keys.dtx | 2 +- macros/latex/contrib/l3kernel/l3legacy.dtx | 2 +- macros/latex/contrib/l3kernel/l3luatex.dtx | 2 +- macros/latex/contrib/l3kernel/l3msg.dtx | 2 +- macros/latex/contrib/l3kernel/l3names.dtx | 2 +- macros/latex/contrib/l3kernel/l3news.pdf | Bin 395879 -> 395879 bytes macros/latex/contrib/l3kernel/l3news01.pdf | Bin 122710 -> 122710 bytes macros/latex/contrib/l3kernel/l3news02.pdf | Bin 150676 -> 150676 bytes macros/latex/contrib/l3kernel/l3news03.pdf | Bin 148702 -> 148702 bytes macros/latex/contrib/l3kernel/l3news04.pdf | Bin 114588 -> 114588 bytes macros/latex/contrib/l3kernel/l3news05.pdf | Bin 112487 -> 112487 bytes macros/latex/contrib/l3kernel/l3news06.pdf | Bin 151573 -> 151573 bytes macros/latex/contrib/l3kernel/l3news07.pdf | Bin 128309 -> 128309 bytes macros/latex/contrib/l3kernel/l3news08.pdf | Bin 163454 -> 163454 bytes macros/latex/contrib/l3kernel/l3news09.pdf | Bin 250139 -> 250139 bytes macros/latex/contrib/l3kernel/l3news10.pdf | Bin 150279 -> 150279 bytes macros/latex/contrib/l3kernel/l3news11.pdf | Bin 170063 -> 170063 bytes macros/latex/contrib/l3kernel/l3news12.pdf | Bin 204990 -> 204990 bytes macros/latex/contrib/l3kernel/l3pdf.dtx | 2 +- macros/latex/contrib/l3kernel/l3prefixes.pdf | Bin 81493 -> 81493 bytes macros/latex/contrib/l3kernel/l3prg.dtx | 2 +- macros/latex/contrib/l3kernel/l3prop.dtx | 2 +- macros/latex/contrib/l3kernel/l3quark.dtx | 2 +- macros/latex/contrib/l3kernel/l3regex.dtx | 2 +- macros/latex/contrib/l3kernel/l3seq.dtx | 2 +- macros/latex/contrib/l3kernel/l3skip.dtx | 2 +- macros/latex/contrib/l3kernel/l3sort.dtx | 2 +- macros/latex/contrib/l3kernel/l3str-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3str.dtx | 2 +- macros/latex/contrib/l3kernel/l3styleguide.pdf | Bin 295977 -> 296098 bytes macros/latex/contrib/l3kernel/l3styleguide.tex | 2 +- macros/latex/contrib/l3kernel/l3syntax-changes.pdf | Bin 242655 -> 242768 bytes macros/latex/contrib/l3kernel/l3syntax-changes.tex | 2 +- macros/latex/contrib/l3kernel/l3sys.dtx | 2 +- macros/latex/contrib/l3kernel/l3term-glossary.pdf | Bin 231062 -> 231173 bytes macros/latex/contrib/l3kernel/l3term-glossary.tex | 2 +- macros/latex/contrib/l3kernel/l3text-case.dtx | 2 +- macros/latex/contrib/l3kernel/l3text-purify.dtx | 2 +- macros/latex/contrib/l3kernel/l3text.dtx | 25 +- macros/latex/contrib/l3kernel/l3tl-analysis.dtx | 2 +- macros/latex/contrib/l3kernel/l3tl.dtx | 2 +- macros/latex/contrib/l3kernel/l3token.dtx | 2 +- macros/latex/contrib/l3kernel/l3unicode.dtx | 2 +- macros/latex/contrib/l3kernel/source3.pdf | Bin 7226173 -> 7227731 bytes macros/latex/contrib/l3kernel/source3.tex | 2 +- macros/latex/contrib/pseudo/LICENSE | 2 +- macros/latex/contrib/pseudo/Makefile | 6 +- macros/latex/contrib/pseudo/README.md | 7 +- macros/latex/contrib/pseudo/VERSION | 2 +- macros/latex/contrib/pseudo/doc/fig/readmefig.svg | 304 +-- macros/latex/contrib/pseudo/doc/fig/readmefig.tex | 2 +- macros/latex/contrib/pseudo/doc/pseudo.bib | 11 +- macros/latex/contrib/pseudo/doc/pseudo.pdf | Bin 574424 -> 949345 bytes macros/latex/contrib/pseudo/doc/pseudo.tex | 2695 ++++++++++++++++---- macros/latex/contrib/pseudo/pseudo.sty | 415 ++- macros/latex/contrib/pseudo/test/pseudotest.tex | 218 +- macros/latex/contrib/xpinyin/xpinyin.dtx | 23 +- macros/latex/contrib/xpinyin/xpinyin.pdf | Bin 208401 -> 209536 bytes macros/latex/contrib/zhnumber/README.md | 2 +- macros/latex/contrib/zhnumber/zhnumber.dtx | 1061 +++++--- macros/latex/contrib/zhnumber/zhnumber.pdf | Bin 271657 -> 299593 bytes 107 files changed, 3918 insertions(+), 1348 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/fixdif/fixdif.dtx b/macros/latex/contrib/fixdif/fixdif.dtx index bced2e43bf..43337e7f88 100644 --- a/macros/latex/contrib/fixdif/fixdif.dtx +++ b/macros/latex/contrib/fixdif/fixdif.dtx @@ -126,14 +126,14 @@ Copyright (C) 2022 by Zhang Tingxuan . % % %<*driver> -\ProvidesFile{fixdif.dtx}[2022/07/09 (c) Copyright 2022 by Zhang Tingxuan] +\ProvidesFile{fixdif.dtx}[2022/07/14 (c) Copyright 2022 by Zhang Tingxuan] \documentclass{ltxdoc} \usepackage{xcolor} \definecolor{titlecolor}{RGB}{0,12,160} \usepackage{doc} \usepackage{fancyvrb} -\fvset{xleftmargin=2em,fontsize=\small,gobble=2} +\fvset{xleftmargin=2.5em,fontsize=\small,gobble=2} \MakeShortVerb| \usepackage{hologo} @@ -145,14 +145,15 @@ Copyright (C) 2022 by Zhang Tingxuan . \title{The \pkg{fixdif} Package} \author{Zhang Tingxuan} -\date{2022/07/09\quad Version 1.2\thanks{\url{https://github.com/AlphaZTX/fixdif}}} +\date{2022/07/14\quad Version 1.3\thanks{\url{https://github.com/AlphaZTX/fixdif}}} \usepackage{hyperref} \hypersetup{ pdftitle = {The fixdif Package}, pdfauthor = {Zhang Tingxuan}, pdfcreator = {pdfLaTeX/XeLaTeX/LuaLaTeX}, - hidelinks, + linkcolor = black, + urlcolor = titlecolor!80!black, } \def\pkg{\textsf} @@ -188,10 +189,9 @@ Copyright (C) 2022 by Zhang Tingxuan . \usepackage{fixdif} - \linespread{1.05} -\parskip5pt plus 2pt minus 1pt -\parindent3em +\parskip6pt plus 2pt minus 1pt +\parindent2.5em \begin{document} \DocInput{\jobname.dtx} @@ -391,14 +391,14 @@ Copyright (C) 2022 by Zhang Tingxuan . % Then you get |\D| for an uppercase upright ``D'' as a differential operator. % % If your second argument contains only one command like |\Delta|, -% you should use \cs{letdif} or \cs{letdif*} instead. +% it's recommended to use \cs{letdif} or \cs{letdif*} instead. % % These two commands will check whether \meta{cmd} has been defined already. % If so, an error message will be given. % -% \noindent\textcolor{titlecolor}{\cs{renewdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif} +% \noindent\textcolor{titlecolor}{\cs{renewdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\renewdif} % \hfill(without correction, preamble only)\\ -% \noindent\textcolor{titlecolor}{\cs{renewdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif*} +% \noindent\textcolor{titlecolor}{\cs{renewdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\renewdif*} % \hfill(with correction, preamble only) % % These two commands are basically the same as \cs{newdif} and \cs{newdif*}. @@ -406,6 +406,55 @@ Copyright (C) 2022 by Zhang Tingxuan . % whether \meta{cmd} has \emph{not} been defined yet. If so, an error message % will be given. % +% \section{Using differential operators temporarily} +% +% \noindent\textcolor{titlecolor}{\cs{mathdif}\marg{symbol}}\DescribeMacro{\mathdif} +% \hfill(without correction, in math mode only)\\ +%\noindent\textcolor{titlecolor}{\cs{mathdif*}\marg{symbol}}\DescribeMacro{\mathdif*} +% \hfill(with correction, in math mode only) +% +% These two commands can be used in math mode only, more specifically, +% after \verb|\begin{document}|. For example, \verb|$x\mathdif{\Delta}\psi$| +% will get $x\mathdif{\Delta}\psi$. +% +% \section{Examples} +% +% This section shows how to use this package properly in your document. +% +% Take the two examples below: +% \begin{Verbatim} +% \letdif{\Delta}{Delta} % Example 1, in preamble +% \letdif{\nabla}{nabla} % Example 2, in preamble +% \end{Verbatim} +% Actually, the second example is more reasonable. +% Sometimes, we take ``$\Delta$'' as laplacian (equivalent to $\nabla^2$), +% while ``$\Delta$'' can also be regarded as a variable +% or function at some other times. Consequently, it's better to save +% a different command for ``$\Delta$'' as laplacian while reserve +% \verb|\Delta| as a command for an ordinary math symbol ``$\Delta$''. +% However, in the vast majority of cases, ``$\nabla$'' is regarded as +% nabla operator so there is no need to save a different command for +% ``$\nabla$''. Then we can correct the code above: +% \begin{Verbatim} +% \letdif{\laplacian}{Delta} % Example 1, corrected, in preamble +% \end{Verbatim} +% With the \pkg{xparse} package, we can define the command in another method: +% \begin{Verbatim} +% \letdif{\nabla}{nabla} +% \DeclareDocumentCommand{ \laplacian }{ s }{ +% \IfBooleanTF{#1}{\mathdif{\Delta}}{\nabla^2} +% } +% \end{Verbatim} +% Then \verb|\laplacian| produces $\nabla^2$ and \verb|\laplacian*| +% produces $\Delta$. +% +% \paragraph{Dealing with ``$+$'' and ``$-$''} +% If you input \verb|$-\d x$|, you'll get ``$-\d x$'' in your document, +% but compared to ``$-\d x$'', ``$-{\d x}$'' is better. To get ``$-{\d x}$'', +% you can input \verb|-{\d x}|. The ``\verb|\d x|'' in a \emph{group} will be +% regarded \textsl{ordinary} but not \textsl{inner} +% so that the small skip will disappear. +% % \section{The source code} % \begin{macrocode} %<*package> @@ -413,10 +462,10 @@ Copyright (C) 2022 by Zhang Tingxuan . % Check the \TeX{} format and provides the package name. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fixdif}[2022/05/29 Interface for defining the differential operator.] +\ProvidesPackage{fixdif}[2022/07/14 Interface for defining the differential operators.] % \end{macrocode} % -% \subsection{Control the skip between slash and differential operator} +% \subsection{Control the skip between slashes and differential operator} % Change the math code of slash ($/$) and backslash ($\backslash$) so that the skip % between slashes and differential operators can be ignored. % \begin{macrocode} @@ -572,6 +621,15 @@ Copyright (C) 2022 by Zhang Tingxuan . \fi% }} \def\renewdif{\@ifstar\s@renewdif\@renewdif} +% \end{macrocode} +% \subsection{In-document commands: \cs{mathdif} and \cs{mathdif*}} +% \begin{macrocode} +\def\@mathdif#1{\mathinner{#1}\mup@tch} +\def\s@mathdif#1{\s@beforep@tch\mathinner{#1\mbox{}}\mup@tch} +\DeclareRobustCommand\mathdif{\@ifstar\s@mathdif\@mathdif} +% \end{macrocode} +% End of the package. +% \begin{macrocode} % % \end{macrocode} \endinput \ No newline at end of file diff --git a/macros/latex/contrib/fixdif/fixdif.pdf b/macros/latex/contrib/fixdif/fixdif.pdf index e83fd2d10d..375106548c 100644 Binary files a/macros/latex/contrib/fixdif/fixdif.pdf and b/macros/latex/contrib/fixdif/fixdif.pdf differ diff --git a/macros/latex/contrib/jpneduenumerate/README.md b/macros/latex/contrib/jpneduenumerate/README.md index aec10d0b35..24a3cd7908 100644 --- a/macros/latex/contrib/jpneduenumerate/README.md +++ b/macros/latex/contrib/jpneduenumerate/README.md @@ -2,6 +2,8 @@ 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 @@ -17,6 +19,11 @@ This package released under [the MIT license](https://ctan.org/license/mit). ## 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). diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf index c7928aaac1..b3ed5127d1 100644 Binary files a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf and b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf differ 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 diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex index 0f54fe909b..d8dccf6580 100644 --- a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex +++ b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex @@ -151,9 +151,11 @@ enumerative expressions in Japanese education} \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 @@ This package introduces enumerative expressions in Japanese education. \psuedocontents{moreinfo}{For More Information}{問い合わせ・詳しくは} +\newpage +\vspace*{-1.8\baselineskip} \psuedosection{Requirements}{System Requirements}{前提条件} \begin{translateing} @@ -207,17 +211,21 @@ To use this package, load .sty file with |\usepackage{jpneduenumerate}| command %\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 @@ For example: たとえば,次のようになります。 \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 @@ For example: \item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。 \item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。 \end{itemize} - \begin{itemize*} \item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。 \item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。 @@ -266,6 +270,7 @@ If you use this package in a Latin text, the |parindent| will be set to the same 欧文のもとでこのパッケージを使用しても,同じ大きさすなわち全角1文字分の|parindent|が設定されます。 \end{translateing} +\newpage \macroexplanation{environment enumerate and itemize} \begin{translateing} @@ -278,56 +283,95 @@ See the examples immediately above. 例は直前のものを見てください。 \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} + +\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} -\newpage \macroexplanation{\parenref{