diff options
author | Norbert Preining <norbert@preining.info> | 2022-07-11 03:04:01 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-07-11 03:04:01 +0000 |
commit | f38fd211142e080f2d76c320225eb1c75889aae6 (patch) | |
tree | ef23c372199389c8eeb8804287114823bbbf5ee5 /macros/latex/contrib | |
parent | 20ce5b015c76436ed3c8022b778a877bcf4852dd (diff) |
CTAN sync 202207110303
Diffstat (limited to 'macros/latex/contrib')
17 files changed, 1113 insertions, 872 deletions
diff --git a/macros/latex/contrib/jpnedumathsymbols/README.md b/macros/latex/contrib/jpnedumathsymbols/README.md index d2455ef6b1..97cd5681fe 100644 --- a/macros/latex/contrib/jpnedumathsymbols/README.md +++ b/macros/latex/contrib/jpnedumathsymbols/README.md @@ -1,42 +1,40 @@ -# Jpnedumathsymbols Package +# jpnedumathsymbols Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces mathematical equation representation in Japanese education. -## System Requirements +## Documents -**This package use Japanese letters.** - -+ TeX format: LaTeX -+ Prerequisite package: amsmath, amssymb, empheq and xparse -+ Prerequisite package without [nonocurriculum]: japanese-otf - - -## Installation - -Move jpnedumathsymbols.sty file to $TEXMF/tex/latex/jpnedumathsymbols. +Documents for this package are available in English and Japanese. ## Achknowledgements -\neconcave, \seconcave, \seconvex and \neconvex are by [Prof. Kouji KODAMA](http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html) and is released under the GNU/GPL license. I would like to thank him. - \arc is by [Prof. Shingo SAITO](http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc). I would like to thank him. -\parallel is by [Mr./Ms. Ohishi]https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html). I would like to thank him/her. +\parallel is by [Mr./Ms. Ohishi](https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html). I would like to thank him/her. This package is inspired by [emath package by Kazuhiro Okuma (a.k.a. tDB)](http://emath.s40.xrea.com/). I would like to thank him. ## License -This package released under [GNU GPL v3 or newer](http://www.gnu.org/licenses/gpl-3.0.html). +This package released under [the MIT license](https://ctan.org/license/mit). + +(C) 2022 Yukoh KUSAKABE ## Revision History -+ Version 1.0 2022-06-29 - + The first public version. ++ Version 1.1 2022-07-10 + + Rewrite README. + + License changed from GNU/GPL to MIT (stopped using codes under GNU/GPL). + + Add the document (jpnedumathsymbols.pdf). + + Add the [curriculum] option, and the default is changed to [nocurriculum]. + + Adjusted the position of \neconcave, \seconcave, \seconvex and \neconvex. + + Bug fix (\dint, \texttherefore and \textbecause). ++ Version 1.0 2022-06-28 + + The first public version. --- diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-en.md b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-en.md deleted file mode 100644 index 57e067ea53..0000000000 --- a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-en.md +++ /dev/null @@ -1,317 +0,0 @@ -# Jpnedumathsymbols Package - -Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces mathematical equation representation in Japanese education. - - -## System Requirements - -**This package use Japanese letters.** - -+ TeX format: LaTeX -+ Prerequisite package: amsmath, amssymb, empheq and xparse -+ Prerequisite package without [nonocurriculum]: japanese-otf - - -## Installation - -Move jpnedumathsymbols.sty file to $TEXMF/tex/latex/jpnedumathsymbols. - - -## Usage - -### \frac \sqrt \lim \vec - -When the package is loaded, the symbols for fractions, root signs, limits, and vectors are automatically changed. If you do not need that, please specify the options, [nofrac], [nosqrt], [nolim], and [novec]. The original symbol is saved with the name "original" (\originalfrac, \originalsqrt, \originallim and \originalvec). - - -### Roman Typeface Meaning Point - -It is customary to use the Roman font to denote points. To make typing easier, the same letter can be typed twice in succession to form a roman letter. For example, \AA will form the Roman letter A. Any conflicts with the original command are renamed (original \AA is \angstrom, original \SS is \capitaleszett). If you do not need that, please specify the option [nopointroman]. - - -### Letters for Curriculum - -Sometimes it is more convenient for characters used in the curriculum to be full-width characters. They are in the form \curr--. If you do not need that, please specify the option [nocurriculum] (see system requirements). - -+ Full-width Roman numeral \currI, \currII, \currIII -+ Full-width capital letters \currA -- \currZ -+ Full-width lowercase letters \curra -- \currz -+ Full-width lowercase Greek letters \curralpha -- \curromega -+ Concurrent courses of study \currIA, \currIIB, \currIIBC, \currIIIC -+ Concurrent courses of study with "+" \currIA*, \currIIB*, \currIIBC*, \currIIIC* - - -### \phantomheight[<letter>] - -Places a post to enclose the box. If no optional argument is taken, \frac{1}{2} is entered. - - -### \comma \period - -Punctuation marks and reading marks are used in mathematical equations. \comma* and \period* are with margin. - - -### \pair{}{} \triplet{}{}{} \quadruplet*{}{}{} - -Order pairs. \pair* \triplet* \quadruplet* fix the size of the parentheses. - - -### \intersection \union - -Another name for \cap and \cup. - - -### \complement{} \cmpl{} - -This is a overline with height matching, even with small letters. \cmpl is another name for \complement. - - -### \tand \tor - -The Japanese "and" and "or" used in mathematical equations. - - -### \eand \eor - -The English "and" and "or" used in mathematical equations. - - -### \lto \lfrom \iff - -Another name for \Longrightarrow, \Longleftarrow and \Longleftrightarrow. It is treated as a \mathrels. - - -### \plto \plfrom \piff - -Invisible \lto/\lfrom/\iff used for immediate line breaks in an align environment. The "p" is named after phantom. - - -### \peq - -Invisible equal sign used for immediate line breaks in an align environment. The "p" is named after phantom. - - -### \set{}{} - -This is an inclusive notation for a set. The delimiter is a vertical bar, which changes to a colon when the option [setcolon] is loaded. - - -### \N \NZ \NP \Z \Q \R \C - -The symbols for whole natural numbers, whole integers greater than or equal to 0, whole integers greater than or equal to 1, whole integers, whole rational numbers, whole real numbers, and whole complex numbers. When the option [mathbb] is loaded, it changes to blackboard bold. - - -### \inverse{<function>} - -The symbol of inverse function. - - -### \abs{} \abs*{} - -Absolute value. \abs* fixes the size. - - -### environment ecases - -\begin{ecases}[align(*)/gather(*)]{<left side>} - -Case classification. This is an input support for the empheq environment. Default is align*. - - -### environment simul - -\begin{simul}{align(*)/gather(*)} - -Simultaneous equations. This is an input support for the empheq environment. Default is gather*. - - -### environment signchart - -\begin{signchart}{<columns>} - -Table of increase/decrease. It takes the number of columns excluding headings as arguments. The internal environment is an array environment, so you write using & \\ \hline etc. - - -### \neconcave \seconcave \seconvex \neconvex - - -Arrows are used in the increase/decrease table. - -This code is by [Prof. Kouji KODAMA](http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html) and is released under the GNU/GPL license. I would like to thank him. - - -### \dint - -The symbol of integral which is always in display style. - - -### \dr \ds \dt \du \dx \dy \dz \dtheta - -Integral variables. - - -### \const - -Integral constant as "const.". - - -### \defint{<from>}{<to>}{<function>} - -The function before the assignment of the definite integral. - - -### \transformvariable{<variable1>}{<from1>}{<to1>}{variable2}{<from2>}{<to2>} - -Variable transformation of a definite integral. - - -### \rvec{}{} \rvec*{}{}{} - -2-dimensional horizontal vector. Asterisked one is 3-dimensional horizontal vectors. When option [rvecbracket] is loaded, they are replaced by square brackets. - - -### \cvec{}{} \cvec*{}{}{} - -2-dimensional vertical vector. Asterisked one is 3-dimensional vertical vectors. When option [cvecbracket] is loaded, they are replaced by square brackets. - - -### \innerproduct{}{} {}{} - -Inner product of vectors. When option [innerproductbracket] is loaded, it is replaced by bracket notation. \inp is another name for \innerproduct. - - -### \sequence{} \seq{} - -Mathematical sequence. \seq is another name for \sequence. - - -### \sum* - -\sum which is text style even in display mode. - - -### \GCD \LCM - -The symbol of greatest common divisor and the symbol of least common multiple. - - -### \degree - -The symbol of degree. - - -### \arc{} - -The symbol of arc. - -This code is by [Prof. Shingo SAITO](http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc). I would like to thank him. - - -### \parallel - -The symbol of parallel. The original symbol is stored in \originalparallel. - -This code is by [Mr./Ms. Ohishi]https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html). I would like to thank him/her. - - -### \similar - -The symbol of similar. - - -### \permutation{}{} \combination{}{} \repeatedpermutation{}{} \repeatedcombination{}{} \homogeneous{}{} - -The symbols for permutations, combinations, repeated permutations, and repeated combinations. \homogeneous is another name for \repeatedcombination. - - -### \expectedvalue{} - -The symbols for expected value. When the option [mathbb] is loaded, it changes to blackboard bold. - - -### \Re \Im - -The symbol of real axis and imaginary axis. The original symbol is stored in \originalRe and \originalIm. - - -### \conjugate{} -### \conj{} - -Complex conjugate. \conj is another name for \conjugate. - - -### \parentext{<text>} \squaretext{<text>} \whitesquaretext{<text>} - -Sentences with round brackets, sentences with square brackets, and sentences with white square brackets. - - -### \ltext{<text>} \lltext{<text>} - -Sentences with square brackets and sentences with white square brackets. - - -### \ltextbegin \lltextbegin \ltextend \lltextend - -Opening square bracket, opening white square bracket, closing square bracket, and closing white square bracket. They are used when there is a line break in the middle of a sentence. - - -### \nomination{} - -Parentheses for using a word or phrase in an equation. - - -### \condition{} - -Parentheses are used to divide cases. \condition*{} is preceded by a space. - - -### \explanation{} - -Parentheses used to explain an expression, preceded by \because. \explanation*{} is not preceded by \because. - - -### \quantify - -Text box for mentioning quantization in the middle of an expression. - - -### \equationunit - -Parentheses for writing units in expressions. - - -### \texttherefore \textbecause - -\therefore and \because adjusted for use in the text. - - -### \QED - -Full-width halmos symbol. - - -## Achknowledgements - -\neconcave, \seconcave, \seconvex and \neconvex are by [Prof. Kouji KODAMA](http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html) and is released under the GNU/GPL license. I would like to thank him. - -\arc is by [Prof. Shingo SAITO](http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc). I would like to thank him. - -\parallel is by [Mr./Ms. Ohishi]https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html). I would like to thank him/her. - -This package is inspired by [emath package by Kazuhiro Okuma (a.k.a. tDB)](http://emath.s40.xrea.com/). I would like to thank him. - - -## License - -This package released under [GNU GPL v3 or newer](http://www.gnu.org/licenses/gpl-3.0.html). - - -## Revision History - -+ Version 1.0 2022-06-29 - + The first public version. - - ---- - -[Yukoh KUSAKABE](https://twitter.com/metaphysicainfo) (screen-name) at [metaphysica.info](https://www.metaphysica.info/)
\ No newline at end of file diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-ja.md b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-ja.md deleted file mode 100644 index 78e4477ac2..0000000000 --- a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-ja.md +++ /dev/null @@ -1,316 +0,0 @@ -# Jpnedumathsymbols パッケージ - -日本の教育における数式表現には,LaTeX の標準である書きかたとはやや異なる部分があります。このパッケージでは,日本の教育における数式表現を導入します。 - - -## 前提条件 - -**This package use Japanese letters.** - -+ TeX format: LaTeX -+ Prerequisite package: amsmath, amssymb, empheq and xparse -+ Prerequisite package without [nonocurriculum]: japanese-otf - - -## インストール - -jpnedumathsymbols.sty を $TEXMF/tex/latex/jpnedumathsymbols (TeXが見つけられる場所)に置いてください。 - - -## 使用方法 - -### \frac \sqrt \lim \vec - -パッケージを読み込むと自動的に分数・根号・極限・ベクトルの記号が変更されます。それが不要なときはオプション [nofrac] [nosqrt] [nolim] [novec] を指定してください。もとの記号は original がついた名前で保存されています(\originalfrac \originalsqrt \originallim \originalvec)。 - - -### Roman Typeface Meaning Point - -点を表すためにローマン体を用いる慣例があります。入力を楽にするために,同じ文字を2つ続けて打つとローマン体になります。たとえば,\AA でローマン体の A になります。元の命令と重なるものは名前を付け替えています(元の \AA は \angstrom,元の \SS は \capitaleszett です)。それが不要なときはオプション [nopointroman] を指定してください。 - - -### Letters for Curriculum - -カリキュラムで使われる文字は全角文字であるほうが便利なことがあります。それらは \curr-- という形の命令になっています。それが不要なときはオプション [nocurriculum] を指定してください。 - -+ 全角ローマ数字 \currI, \currII, \currIII -+ 全角英字大文字 \currA -- \currZ -+ 全角英字小文字 \curra -- \currz -+ 全角ギリシア文字小文字 \curralpha -- \curromega -+ 並行カリキュラムのセット \currIA, \currIIB, \currIIBC, \currIIIC -+ 並行カリキュラムのセット(+つき) \currIA*, \currIIB*, \currIIBC*, \currIIIC* - - -### \phantomheight[<letter>] - -枠で囲うための支柱を立てます。オプション引数を取らなければ \frac{1}{2} が入ります。 - - -### \comma \period - -数式中で用いる句点と読点です。アスタリスクをつけると前に余白が付きます。 - - -### \pair{}{} \triplet{}{}{} \quadruplet*{}{}{} - -順序対です。アスタリスクをつけると括弧の大きさが固定されます。 - - -### \intersection \union - -\cap と \cup の別名です。 - - -### \complement{} \cmpl{} - -小さな文字を入れても高さが揃う上線です。\cmpl は \complement の別名です。 - - -### \tand \tor - -数式中で用いる日本語の「かつ」と「または」です。 - - -### \eand \eor - -数式中で用いる英語の「and」と「or」です。 - - -### \lto \lfrom \iff - -\Longrightarrow \Longlrftarrow \Longleftrightarrow の別名です。\mathrel として扱われます。 - - -### \plto \plfrom \piff - -align 環境で直ちに改行するときに用いる見えない \lto \lfrom \iff です。「p」 は phantom が由来です。 - - -### \peq - -align 環境で直ちに改行するときに用いる見えない等号です。「p」 は phantom が由来です。 - - -### \set{}{} - -集合の内包的記法です。区切りは縦棒ですが,[setcolon] オプションを読み込むとコロンに変わります。 - - -### \N \NZ \NP \Z \Q \R \C - -自然数全体,0以上の整数全体,1以上の整数全体,整数全体,有理数全体,実数全体,複素数全体の記号です。[mathbb] オプションを読み込むと黒板太字に変わります。 - - -### \inverse{<function>} - -逆関数の記号です。 - - -### \abs{} \abs*{} - -絶対値です。アスタリスクをつけると大きさが固定されます。 - - -### ecases 環境 - -\begin{ecases}[align(*)/gather(*)]{<left side>} - -場合分けです。empheq環境の入力支援です。既定は align* です。 - - -### simul 環境 - -\begin{simul}{align(*)/gather(*)} - -連立方程式です。empheq環境の入力支援です。既定は gather* です。 - - -### signchart 環境 - -\begin{signchart}{<columns>} - -増減表です。見出しを除いた列数を引数に取ります。内部は array 環境ですので & \\ \hline などを用いて書きます。 - - -### \neconcave \seconcave \seconvex \neconvex - -増減表で使う矢印です。 - -このコードは[児玉宏児氏](http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html)によるもので,GNU/GPLライセンスで公開なさっています。お礼申しあげます。 - - -### \dint - -常にディスプレイスタイルになる積分記号です。 - - -### \dr \ds \dt \du \dx \dy \dz \dtheta - -積分変数です。 - - -### \const - -積分定数を const. と出力します。 - - -### \defint{<from>}{<to>}{<function>} - -代入前の定積分です。 - - -### \transformvariable{<variable1>}{<from1>}{<to1>}{variable2}{<from2>}{<to2>} - -定積分の変数変換です。 - - -### \rvec{}{} \rvec*{}{}{} - -2次元横ベクトルです。アスタリスク付きは3次元横ベクトルです。[rvecbracket] オプションを読み込むと角括弧に置き換えられます。 - - -### \cvec{}{} \cvec*{}{}{} - -2次元縦ベクトルです。アスタリスク付きは3次元縦ベクトルです。[cvecbracket] オプションを読み込むと角括弧に置き換えられます。 - - -### \innerproduct{}{} {}{} - -ベクトルの内積です。[innerproductbracket] オプションを読み込むとブラケット記法に置き換えられます。\inp は \innerproduct の別名です。 - - -### \sequence{} \seq{} - -数列です。\seq は \sequence の別名です。 - - -### \sum* - -ディスプレイ数式中でもテキストスタイルになる \sum です。 - - -### \GCD \LCM - -最大公約数と最小公倍数の記号です。 - - -### \degree - -度の記号です。 - - -### \arc{} - -弧の記号です。 - -このコードは[斎藤新悟氏](http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc)によるものです。お礼申しあげます。 - - -### \parallel - -平行の記号です。元の記号は \originalparallel に保存されます。 - -このコードは[大石氏](https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html)によるものです。お礼申しあげます。 - - -### \similar - -相似の記号です。 - - -### \permutation{}{} \combination{}{} \repeatedpermutation{}{} \repeatedcombination{}{} \homogeneous{}{} - -順列・組み合わせ・重複順列・重複組み合わせの記号です。\homogeneous は \repeatedcombination の別名です。 - - -### \expectedvalue{} - -期待値の記号です。[mathbb] オプションを読み込むと黒板太字に変わります。 - - -### \Re \Im - -実軸・虚軸の記号です。元の記号は \originalRe \originalIm に保存されます。 - - -### \conjugate{} -### \conj{} - -複素共役です。\conj は \conjugate の別名です。 - - -### \parentext{<text>} \squaretext{<text>} \whitesquaretext{<text>} - -丸括弧付き文章,鉤括弧付き文章,白抜き鉤括弧付き文章です。 - - -### \ltext{<text>} \lltext{<text>} - -鉤括弧付き文章,白抜き鉤括弧付き文章です。 - - -### \ltextbegin \lltextbegin \ltextend \lltextend - -開き鉤括弧,開き白抜き鉤括弧,閉じ鉤括弧,閉じ白抜き鉤括弧です。途中で改行が入るときに用いるとよいでしょう。 - - -### \nomination{} - -語句を数式に用いるための括弧です。 - - -### \condition{} - -場合分けに用いるための括弧です。\condition*{} は前に空白を伴います。 - - -### \explanation{} - -式の説明に用いるための括弧で,前に \because を伴います。\explanation*{} は伴いません。 - - -### \quantify - -式の途中で量子化について言及するためのテキストボックスです。 - - -### \equationunit - -式の中で単位を書くための括弧です。 - - -### \texttherefore \textbecause - -本文中で使うために調整した \therefore と \because です。 - - -### \QED - -全角幅のハルモス記号です。 - - -## Achknowledgements - -\neconcave \seconcave \seconvex \neconvex は[児玉宏児氏](http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html)によるもので,GNU/GPLライセンスで公開なさっています。お礼申しあげます。 - -\arc は[斎藤新悟氏](http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc)によるものです。お礼申しあげます。 - -\parallel は[大石氏](https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html)によるものです。お礼申しあげます。 - -このパッケージの作成にあたっては,[大熊一弘(tDB)氏によるemath](http://emath.s40.xrea.com/)の影響を受けています。お礼申しあげます。 - - -## ライセンス - -このパッケージは[GNU GPL v3 or newer](http://www.gnu.org/licenses/gpl-3.0.html)のもとで配布しています。 - - -## 更新履歴 - -+ Version 1.0 2022-06-29 - + The first public version. - - ---- - -[Yukoh KUSAKABE](https://twitter.com/metaphysicainfo) (screen-name) at [metaphysica.info](https://www.metaphysica.info/)
\ No newline at end of file diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.pdf b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.pdf Binary files differnew file mode 100644 index 0000000000..2ab929f39f --- /dev/null +++ b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.pdf diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.sty b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.sty index f22aa76b81..e120232a92 100644 --- a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.sty +++ b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.sty @@ -6,12 +6,12 @@ %% https://www.metaphysica.info/ %% https://twitter.com/metaphysicainfo %% -%% This file released under -%% [GNU GPL v3 or newer](http://www.gnu.org/licenses/gpl-3.0.html). +%% This package released under +%% [the MIT license](https://ctan.org/license/mit). %% % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jpnedumathsymbols}[2022/06/29 v1.0] +\ProvidesPackage{jpnedumathsymbols}[2022/07/10 v1.1] % %% [nofrac] \newif\if@jpnedu@symbol@nofrac @@ -38,10 +38,11 @@ \@jpnedu@symbol@nopointromanfalse \DeclareOption{nopointroman}{\@jpnedu@symbol@nopointromantrue}% % -%% [nocurriculum] +%% [curriculum][nocurriculum] \newif\if@jpnedu@symbol@nocurriculum -\@jpnedu@symbol@nocurriculumfalse +\@jpnedu@symbol@nocurriculumtrue \DeclareOption{nocurriculum}{\@jpnedu@symbol@nocurriculumtrue}% +\DeclareOption{curriculum}{\@jpnedu@symbol@nocurriculumfalse}% % %% [mathbb] \newif\if@jpnedu@symbol@mathbb @@ -68,6 +69,11 @@ \@jpnedu@symbol@innerproductbracketfalse \DeclareOption{innerproductbracket}{\@jpnedu@symbol@innerproductbrackettrue} % +%% [lua] +\newif\if@jpnedu@symbol@lua +\@jpnedu@symbol@luafalse +\DeclareOption{lua}{\@jpnedu@symbol@luatrue}% +% \ExecuteOptions{} \ProcessOptions\relax % @@ -204,7 +210,11 @@ \else % % for \ajroman +\if@jpnedu@symbol@lua +\RequirePackage{luatexja-otf} +\else \RequirePackage{otf} +\fi % %% \mathI \mathA \mathIA etc. \DeclareRobustCommand{\currI}{\ajRoman{1}} @@ -367,9 +377,9 @@ %% \set{}{} %% ([setcolon]) \if@jpnedu@symbol@setcolon -\DeclareRobustCommand{\set}[2]{\left\{\,#1\,;\,#2\,\right\}} +\DeclareRobustCommand{\set}[2]{\left\{\,#1\;;\;#2\,\right\}} \else -\DeclareRobustCommand{\set}[2]{\left\{\,#1\,\middle|\,#2\,\right\}} +\DeclareRobustCommand{\set}[2]{\left\{\,#1\;\middle|\;#2\,\right\}} \fi % %% \N \NZ \NP \Z \Q \R \C @@ -421,19 +431,35 @@ %% \seconcave %% \seconvex %% \neconvex -% http://www.math.kobe-u.ac.jp/HOME/kodama/tips-latex-bend-arrow.html -% (GNU/GPL) -\DeclareRobustCommand{\seconvex}{{\begin{picture}(10,10)% -\put(10,10){\oval(20,20)[lb]}\put(10,0){\vector(1,0){2}}\end{picture}}} -\DeclareRobustCommand{\neconcave}{{\begin{picture}(10,10)% -\put(10,0){\oval(20,20)[lt]}\put(10,10){\vector(1,0){2}}\end{picture}}} -\DeclareRobustCommand{\neconvex}{{\begin{picture}(10,10)% -\put(0,10){\oval(20,20)[rb]}\put(10,10){\vector(0,1){2}}\end{picture}}} -\DeclareRobustCommand{\seconcave}{{\begin{picture}(10,10)% -\put(0,0){\oval(20,20)[rt]}\put(10,0){\vector(0,-1){2}}\end{picture}}} +\DeclareRobustCommand{\neconcave} +{\@ifstar{\@jpnedu@symbol@neconcave@star}{\@jpnedu@symbol@neconcave@nostar}} +\DeclareRobustCommand{\seconcave} +{\@ifstar{\@jpnedu@symbol@seconcave@star}{\@jpnedu@symbol@seconcave@nostar}} +\DeclareRobustCommand{\seconvex} +{\@ifstar{\@jpnedu@symbol@seconvex@star}{\@jpnedu@symbol@seconvex@nostar}} +\DeclareRobustCommand{\neconvex} +{\@ifstar{\@jpnedu@symbol@neconvex@star}{\@jpnedu@symbol@neconvex@nostar}} +% +\DeclareRobustCommand{\@jpnedu@symbol@seconvex@star}{{\begin{picture}(10,10)% +\put(10,10){\oval(20,20)[lb]}\put(11,-0.25){\vector(4,-1){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@neconcave@star}{{\begin{picture}(10,10)% +\put(10,0){\oval(20,20)[lt]}\put(11,10.25){\vector(4,1){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@neconvex@star}{{\begin{picture}(10,10)% +\put(0,10){\oval(20,20)[rb]}\put(10.25,11){\vector(1,4){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@seconcave@star}{{\begin{picture}(10,10)% +\put(0,0){\oval(20,20)[rt]}\put(10.25,-1){\vector(1,-4){0}}\end{picture}}} +% +\DeclareRobustCommand{\@jpnedu@symbol@seconvex@nostar}{\raisebox{-0.25em}{\begin{picture}(10,10)% +\put(10,10){\oval(20,20)[lb]}\put(11,-0.25){\vector(4,-1){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@neconcave@nostar}{\raisebox{-0.25em}{\begin{picture}(10,10)% +\put(10,0){\oval(20,20)[lt]}\put(11,10.25){\vector(4,1){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@neconvex@nostar}{\raisebox{-0.25em}{\begin{picture}(10,10)% +\put(0,10){\oval(20,20)[rb]}\put(10.25,11){\vector(1,4){0}}\end{picture}}} +\DeclareRobustCommand{\@jpnedu@symbol@seconcave@nostar}{\raisebox{-0.25em}{\begin{picture}(10,10)% +\put(0,0){\oval(20,20)[rt]}\put(10.25,-1){\vector(1,-4){0}}\end{picture}}} % %% \dint -\DeclareRobustCommand{\dint}{{\displaystyle\int}} +\DeclareRobustCommand{\dint}{\displaystyle\int} % %% \dr \ds \dt \du \dx \dy \dz \dtheta \DeclareRobustCommand{\dr}{\,dr} @@ -541,11 +567,11 @@ $#4$&$#5$&$\to$&$#6$ \DeclareRobustCommand{\notparallel} {\mathrel{\raise.3ex\hbox{\scalebox{.7}{% \ooalign{\rotatebox[origin=c]{-7}{/}\kern-.35em\rotatebox[origin=c]{-7}{/}\crcr% -\hfil\raisebox{.2ex}{$\backslash$}\hfil}}}}}% +\hfil\raisebox{.0ex}{$\backslash$}\hfil}}}}}% % %% \similar \let\originalsimilar\similar -\DeclareRobustCommand{\similar}{\mathrel{\lower.2ex\hbox{\scalebox{1.3}{∽}}}} +\DeclareRobustCommand{\similar}[1][1.3]{\mathrel{\lower.2ex\hbox{\scalebox{#1}{∽}}}} % %% \permutation{}{} %% \combination{}{} @@ -616,8 +642,8 @@ $#4$&$#5$&$\to$&$#6$ % %% \texttherefore %% \textbecause -\DeclareRobustCommand{\texttherefore}{\ensuremath{\raisebox{1.5pt}{$\therefore$}}} -\DeclareRobustCommand{\textbecause}{\ensuremath{\raisebox{1.5pt}{$\because$}}} +\DeclareRobustCommand{\texttherefore}{\raisebox{1.5pt}{$\therefore$}} +\DeclareRobustCommand{\textbecause}{\raisebox{1.5pt}{$\because$}} % %% \QED \DeclareRobustCommand{\QED}{■} diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.tex b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.tex new file mode 100644 index 0000000000..98aeb04cd4 --- /dev/null +++ b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols.tex @@ -0,0 +1,998 @@ +\documentclass[% +fleqn,% +paper=a4paper,% +fontsize=10pt,% +open_bracket_pos=zenkakunibu_nibu,% +hanging_punctuation,% +]% +{jlreq} +\jlreqsetup{% +itemization_beforeafter_space=0pt,% +itemization_itemsep=0pt% +} +\makeatletter +\RequirePackage{luatexja} +\RequirePackage{luatexja-otf} +\RequirePackage{graphicx} +\RequirePackage{amsmath} +%%%% +%\RequirePackage{amssymb,amsfonts} +%%%% +\DeclareRobustCommand{\metaphysicaicon}{\raisebox{-4.0pt}{\includegraphics[width=16pt]{metaphysicaicon.pdf}}} +\RequirePackage[normalem]{ulem} +\RequirePackage[explicit]{titlesec} +\titleformat{\section}[hang]{}{}{0pt}{\uuline{\raisebox{1pt}{\textsf{\thesection\quad #1}}}}[\vspace{0.35\baselineskip}] +\renewcommand{\thesection}{\S\,\arabic{section}} +\let\originalsection\section +\DeclareRobustCommand{\section}{\@ifstar{\@metaphysica@section@star}{\@metaphysica@section@nostar}} +\DeclareRobustCommand{\@metaphysica@section@star}[1]{\vspace{0.5\baselineskip}\originalsection{#1}\vspace*{-\baselineskip}} +\DeclareRobustCommand{\@metaphysica@section@nostar}[1]{\vspace{0.5\baselineskip}\originalsection{#1}} +\RequirePackage[% +truedimen,% +margin=30truemm, +includehead% +]{geometry} +\RequirePackage{lastpage} +\RequirePackage{fancyhdr} +\pagestyle{fancy} +\DeclareRobustCommand{\headertitle}[2][\metaphysicaicon]{% +\rhead[#2]{#1{}\quad\thepage{}/{}\pageref{LastPage}}% +\lhead[\thepage{}/{}\pageref{LastPage}\quad{}#1]{#2}% +\cfoot{}% +} +\RequirePackage{setspace} +\setstretch{1.155} +\DeclareRobustCommand{\linespace}{\@ifstar{\vspace{\baselineskip}}{\vspace{0.25\baselineskip}}} +\DeclareRobustCommand{\linesmash}{\@ifstar{\vspace{-\baselineskip}}{\vspace{-0.25\baselineskip}}} +\AtBeginDocument{% +\abovedisplayskip =0.125\abovedisplayskip +\abovedisplayshortskip=0.125\abovedisplayshortskip +\belowdisplayskip =0.125\belowdisplayskip +\belowdisplayshortskip=0.125\belowdisplayshortskip} +\setlength{\jot}{0pt}% +\setlength{\mathindent}{2\zw}% +\renewcommand{\floatpagefraction}{0.75} +\allowdisplaybreaks[2] +\RequirePackage[no-math]{fontspec} +\RequirePackage[no-math,deluxe,haranoaji]{luatexja-preset} +\RequirePackage{multicolpar} +\RequirePackage[style=iso]{datetime2} +\RequirePackage[unicode]{hyperref} +\RequirePackage{xparse} +\RequirePackage{dashbox} +\newcounter{psuedosectioncounter} +\setcounter{psuedosectioncounter}{1} +\newcounter{psuedocontentscounter} +\setcounter{psuedocontentscounter}{1} +\DeclareRobustCommand{\psuedosection}[3]{% +\hypertarget{#1}{\mbox{}}\begin{multicolpar}{2}% +\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #2}}}} + +\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #3}}}} +\end{multicolpar}% +\stepcounter{psuedosectioncounter}% +\vspace{\baselineskip}% +} +\DeclareRobustCommand{\psuedocontents}[3]{% +\begin{multicolpar}{2}% +\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #2}}} + +\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #3}}}\end{multicolpar}% +\stepcounter{psuedocontentscounter}% +} +\newenvironment{translateing}% +{\begin{multicolpar}{2}} +{\end{multicolpar}\vspace{\baselineskip}} +\DeclareRobustCommand{\maketitletranslating}% +{\maketitle\thispagestyle{fancy} +\vspace{\baselineskip}\begin{multicolpar}{2} +\textsf{English} + +\noindent +\textsf{日本語 (Japanese)} +\end{multicolpar}\vspace{\baselineskip}} +\NewDocumentCommand\macroexplanation{v}{% +\noindent\hspace*{\fill}{\texttt{#1}}\hspace*{\fill}\linespace% +} +\NewDocumentEnvironment{macroexample}{O{0.625} +b}{% +\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{% +#2% +}}\hspace*{\fill}}% +{\vspace{\baselineskip}} +\NewDocumentEnvironment{macroexample*}{O{0.625} m +b}{% +\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{% +\vspace{-0.5\baselineskip}\begin{#2}% +#3 +\end{#2}% +}}\hspace*{\fill}} +{\vspace{\baselineskip}} +\let\code\texttt +\setlength{\fboxsep}{1em} +\setstretch{1.05} +\DeclareRobustCommand{\commandtojskip}{\hspace{2.40554pt plus 1.49994pt minus 0.59998pt}} +\RequirePackage{listings, jlisting} +\lstset{ + language=[LaTeX]TeX, + basicstyle={\ttfamily}, + identifierstyle={\small}, + commentstyle={\small\itshape}, + keywordstyle={\small\bfseries}, + ndkeywordstyle={\small}, + stringstyle={\small\ttfamily}, + frame=single, + breaklines=true, + columns=[l]{fullflexible}, + stepnumber=1, + xrightmargin=0.1709\textwidth, + xleftmargin=0.1709\textwidth, + lineskip=-0.5ex +} +\RequirePackage{bxtexlogo} +\RequirePackage[lua,curriculum]{jpnedumathsymbols} +\RequirePackage{shortvrb} +\MakeShortVerb{\|} +\makeatother +% +\hypersetup{% +bookmarksnumbered=true,% +colorlinks=true,% +linkcolor=blue,% +urlcolor=blue,% +setpagesize=false,% +pdftitle={The jpnedumathsymbols package},% +pdfauthor={Yukoh KUSAKABE},% +pdfsubject={The jpnedumathsymbols package},% +pdfkeywords={TeX LaTeX representation symbol Japanese education}} +\title{The \code{jpnedumathsymbols} package:\\[0.25\baselineskip] +mathematical equation representation in Japanese education} +\author{Yukoh KUSAKABE} +\date{\today} +\headertitle[Yukoh KUSAKABE\quad\metaphysicaicon]{The \code{jpnedumathsymbols} package} +\makeatletter +\DeclareRobustCommand{\asterreftext}[1]{{\textsf{[*\ref*{#1}]}}} +\DeclareRobustCommand{\asterrefsuperscript}[1]{\@textsuperscript{\scriptsize\!\!\textsf{[*\ref*{#1}]}}} +\makeatother +\begin{document} +\maketitletranslating + +\begin{translateing} +Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces mathematical equation representation in Japanese education. + +日本の教育における数式表現には,LaTeX の標準である書きかたとはやや異なる部分があります。このパッケージでは,日本の教育における数式表現を導入します。 +\end{translateing} + +\psuedocontents{Requirements}{System Requirements}{前提条件} + +\psuedocontents{Installation}{Installation}{インストール} + +\psuedocontents{Loading}{Loading}{読み込み} + +\psuedocontents{Usage}{Usage}{使用方法} + +\psuedocontents{moreinfo}{For More Information}{問い合わせ・詳しくは} + +\psuedosection{Requirements}{System Requirements}{前提条件} + +\begin{translateing} +\textbullet\ \LaTeXe\ format\\ +\textbullet\ \code{amsmath} package\\ +\textbullet\ \code{amssymb} package\\ +\textbullet\ \code{empheq} package\\ +\textbullet\ \code{xparse} package\\ +\textbullet\ \scalebox{0.9}[1]{\pTeX/\upTeX\ engine and \code{japanese-otf} package}\\\hfill(when \code{[curriculum]} is loaded)\\ +\textbullet\ \LuaTeX\ engine \code{luatexja-otf} package\\\hfill\scalebox{0.9}[1]{(when \code{[lua]} and \code{[curriculum]} are loaded)} + +\noindent +\textbullet\ \LaTeXe フォーマット\\ +\textbullet\ \code{amsmath} パッケージ\\ +\textbullet\ \code{amssymb} パッケージ\\ +\textbullet\ \code{empheq} パッケージ\\ +\textbullet\ \code{xparse} パッケージ\\ +\textbullet\ \scalebox{0.95}[1]{\pTeX/\upTeX と\code{japanese-otf} パッケージ}\\\hfill (\code{[curriculum]}使用時)\\ +\textbullet\ \LuaTeX と\code{luatexja-otf} パッケージ\\\hfill\scalebox{0.95}[1]{(\code{[lua]}かつ\code{[curriculum]}使用時)} +\end{translateing} + +\newpage +\psuedosection{Installation}{Installation}{インストール} + +\begin{translateing} +If not available, move jpnedumathsymbols.sty file to\\\code{\$TEXMF/tex/latex/jpnedumathsymbols}. + +直ちに使えなければ,\\jpnedumathsymbols.styを\\\code{\$TEXMF/tex/latex/jpnedumathsymbols}\\%(\TeX が見つけられる場所) +に置いてください。 +\end{translateing} + +\psuedosection{Loading}{Loading}{読み込み} + +\begin{translateing} +To use this package, load .sty file with |\usepackage{jpnedumathsymbols}| command in preamble. + +このパッケージを使用するには,プリアンブルに\commandtojskip|\usepackage{jpnedumathsymbols}| と書いてください。 + +Several options are available and will be presented in the usage guide. +The reason is that they generally just switch the output of the same instruction. +One exception is the |[lua]| option. +This should be specified if you are using \LuaLaTeX\ when using the |[curriculum]| option. +The reason for this specification is to allow for flexibility in future enhancements. + +いくつかのオプションがありますが,使用方法を説明する中で紹介します。 +おおむね,同じ命令での出力を切り替えるだけだからです。 +例外として|[lua]|オプションがあります。 +これは,|[curriculum]|オプションを使うときに\LuaLaTeX を使っているのであれば指定してください。 +このような仕様にしているのは,将来的な機能拡張において柔軟性を保てるようにするためです。 +\end{translateing} + +\psuedosection{Usage}{Usage}{使用方法} + +\macroexplanation{\frac \sqrt \lim \vec} + +\begin{translateing} +When the package is loaded, the symbols for fractions, root signs, limits, and vectors are automatically changed. +If you do not need that, please specify the options, |[nofrac]|, |[nosqrt]|, |[nolim]|, and |[novec]|. +The original symbol is saved with the name |original| (|\originalfrac|, |\originalsqrt|, |\originallim| and |\originalvec|). + +パッケージを読み込むと自動的に分数・根号・極限・ベクトルの記号が(教科書風に)変更されます。 +変更されたくないときはオプション|[nofrac]| |[nosqrt]| |[nolim]| |[novec]|を指定してください。 +もとの記号は|original|をつけた名前で保存されています(|\originalfrac| |\originalsqrt| |\originallim| |\originalvec|)。 +\end{translateing} + +\newpage +\begin{lstlisting} +$\frac{1}{2}+2^{\frac{1}{2}}+\lim_{x\to0}x$ +\begin{gather*} +\frac{1}{2}+2^{\frac{1}{2}}+\sqrt[3]{2}+\lim_{x\to0}x\\ +\vec{a}+\vec{b}+\vec{\AA\BB} +\end{gather*} +$\originalfrac{1}{2}+2^{\originalfrac{1}{2}}+\originallim_{x\to0}x$ +\begin{gather*} +\originalfrac{1}{2}+2^{\originalfrac{1}{2}}+\originalsqrt[3]{2}+\originallim_{x\to0}x\\ +\originalvec{a}+\originalvec{b}+\originalvec{\AA\BB} +\end{gather*} +\end{lstlisting} + +\begin{macroexample} +$\frac{1}{2}+2^{\frac{1}{2}}+\lim_{x\to0}x$ +\begin{gather*} +\frac{1}{2}+2^{\frac{1}{2}}+\sqrt[3]{2}+\lim_{x\to0}x\\ +\vec{a}+\vec{b}+\vec{\AA\BB} +\end{gather*} +$\originalfrac{1}{2}+2^{\originalfrac{1}{2}}+\originallim_{x\to0}x$ +\begin{gather*} +\originalfrac{1}{2}+2^{\originalfrac{1}{2}}+\originalsqrt[3]{2}+\originallim_{x\to0}x\\ +\originalvec{a}+\originalvec{b}+\originalvec{\AA\BB} +\end{gather*} +\end{macroexample} + +\begin{translateing} +Fractions are also larger in inline equations. +On the other hand, exponents, for example, have shorter horizontal bars. +The limit subscripts are always directly below. + +分数はインライン数式でも大きくなります。 +一方,指数などでは横棒が短くなります。 +極限の添字も常に真下になります。 +\end{translateing} + +\macroexplanation{Roman Typeface Meaning Point} + +\begin{translateing} +It is customary to use the Roman font to denote points. +To make typing easier, the same letter can be typed twice in succession to form a roman letter. +For example, |\AA| will form the Roman letter A. +Any conflicts with the original command are renamed (original |\AA| is |\angstrom|, original |\SS| is |\capitaleszett|). +If you do not need that, please specify the option |[nopointroman]|. + +点を表すためにローマン体を用いる慣例があります。 +入力を楽にするために,同じ文字を2つ続けて打つとローマン体になります。 +たとえば,|\AA|でローマン体のAになります。 +元の命令と重なるものは名前を付け替えています(元の\commandtojskip|\AA|は\commandtojskip|\angstrom|,元の\commandtojskip|\SS|は\commandtojskip|\capitaleszett|です)。 +不要なときはオプション|[nopointroman]|を指定してください。 +\end{translateing} + +\newpage +\begin{lstlisting} +\begin{gather*} +ABC\\ +\AA\BB\CC +\end{gather*} +\end{lstlisting} + +\begin{macroexample} +\begin{gather*} +ABC\\ +\AA\BB\CC +\end{gather*} +\end{macroexample} + +\macroexplanation{Letters for Curriculum} + +\begin{translateing} +For this feature only, the |[curriculum]| option must be loaded when used; for \LuaTeX, the |[lua]| option is also required. + +この機能のみほかの設計と異なり,使用するときに|[curriculum]|オプションを読み込んでください。\LuaTeX の場合はさらに|[lua]| オプションも必要です。 + +Sometimes it is more convenient for characters used in the curriculum to be full-width characters. They are in the form |\curr??|. + +カリキュラムで使われる文字は全角文字であるほうが便利なことがあります。それらは\commandtojskip|\curr??|\commandtojskip という形の命令になっています。 + +\noindent +\textbullet\ Full-width Roman numeral \\\hfill|\currI|, |\currII|, |\currIII|\\ +\textbullet\ Full-width capital letters \\\hfill|\currA| -- |\currZ|\\ +\textbullet\ Full-width lowercase letters \\\hfill|\curra| -- |\currz|\\ +\textbullet\ Full-width lowercase Greek letters \\\hfill|\curralpha| -- |\curromega|\\ +\textbullet\ Concurrent courses of study \\\hfill|\currIA|, |\currIIB|, |\currIIBC|, |\currIIIC|\\ +\textbullet\ Concurrent courses of study with "+" \\\hfill\scalebox{0.9}[1]{\code{\textbackslash currIA*}, \code{\textbackslash currIIB*}, \code{\textbackslash currIIBC*}, \code{\textbackslash currIIIC*}} + +\noindent +\textbullet\ 全角ローマ数字 \\\hfill|\currI|, |\currII|, |\currIII|\\ +\textbullet\ 全角英字大文字 \\\hfill|\currA| -- |\currZ|\\ +\textbullet\ 全角英字小文字 \\\hfill|\curra| -- |\currz|\\ +\textbullet\ 全角ギリシア文字小文字 \\\hfill|\curralpha| -- |\curromega|\\ +\textbullet\ 並行カリキュラムのセット \\\hfill|\currIA|, |\currIIB|, |\currIIBC|, |\currIIIC|\\ +\textbullet\ 並行カリキュラムのセット(+つき) \\\hfill\scalebox{0.9}[1]{\code{\textbackslash currIA*}, \code{\textbackslash currIIB*}, \code{\textbackslash currIIBC*}, \code{\textbackslash currIIIC*}} +\end{translateing} + +\noindent\hspace*{\fill}\fbox{\parbox{0.625\textwidth}{% +\ttfamily +数学\code{\textbackslash currIA} と数学\code{\textbackslash currIIBC} 。数学\code{\textbackslash currIIIC*}。% +}}\hspace*{\fill}% +{\vspace{0.25\baselineskip}} + +\begin{macroexample} +数学\currIA と数学\currIIBC 。数学\currIIIC*。 +\end{macroexample} + +\newpage +\macroexplanation{\phantomheight[<letter>]} + +\begin{translateing} +Places a post to enclose the box. +If no optional argument is taken, |\frac{1}{2}| is entered. + +枠で囲うための支柱を立てます。 +オプション引数を取らなければ\commandtojskip|\frac{1}{2}|\commandtojskip が入ります。 +\end{translateing} + +\begin{lstlisting} +\begin{tabular}{ccc}\hline +$f(x)$&$1$&$2$\\\hline +\end{tabular}\quad +\begin{tabular}{ccc}\hline +\phantomheight$f(x)$&$1$&$2$\\\hline +\end{tabular} +\end{lstlisting} + +\begin{macroexample} +\begin{tabular}{ccc}\hline +$f(x)$&$1$&$2$\\\hline +\end{tabular}\quad +\begin{tabular}{ccc}\hline +\phantomheight$f(x)$&$1$&$2$\\\hline +\end{tabular} +\end{macroexample} + +\hspace*{\fill}\textsf{% +%\macroexplanation{ +Miscellaneous mathematical equation-related symbols\qquad 雑多な数式関係記号たち% +}\hspace*{\fill} + +\linespace +\begin{translateing} +It is easier to see the examples than to explain them one by one, so we will list them. + +逐一説明するよりも例を見ていただくほうが分かりやすいので列挙します。 +\end{translateing} + +\begin{lstlisting} +\[A\comma B\comma C\period D\qquad +A\comma* B\comma* C\period* D\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[A\comma B\comma C\period D\qquad +A\comma* B\comma* C\period* D\] +\end{macroexample} + +\begin{lstlisting} +\begin{gather*} +\pair{1}{\frac{1}{2}} +\triplet{1}{\frac{1}{2}}{3} +\quadruplet{1}{\frac{1}{2}}{3}{4}\\ +\pair*{1}{\frac{1}{2}} +\triplet*{1}{\frac{1}{2}}{3} +\quadruplet*{1}{\frac{1}{2}}{3}{4} +\end{gather*} +\end{lstlisting} + +\begin{macroexample} +\begin{gather*} +\pair{1}{\frac{1}{2}} +\triplet{1}{\frac{1}{2}}{3} +\quadruplet{1}{\frac{1}{2}}{3}{4}\\ +\pair*{1}{\frac{1}{2}} +\triplet*{1}{\frac{1}{2}}{3} +\quadruplet*{1}{\frac{1}{2}}{3}{4} +\end{gather*} +\end{macroexample} + +\newpage +\hspace*{0.14\textwidth}|\intersection| is a synonym for |\cap|.\\ +\indent\hspace*{0.14\textwidth}|\union| is a synonym for |\cup|. +\begin{lstlisting} +\[A\intersection B\qquad A\union B\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[A\intersection B\qquad A\union B\] +\end{macroexample} + +\hspace*{0.14\textwidth}|\cmpl| is a synonym for |\complement|. +\begin{lstlisting} +\[\complement{a}+\complement{b} = \cmpl{a}+\cmpl{b}\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[\complement{a}+\complement{b} = \cmpl{a}+\cmpl{b}\] +\end{macroexample} + +\hspace*{0.14\textwidth}They are named after text-and/or, english-and/or. +\begin{lstlisting} +\[(A\tand B)\tor C\qquad (A\eand B)\eor C\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[(A\tand B)\tor C\qquad (A\eand B)\eor C\] +\end{macroexample} + +\hspace*{0.14\textwidth}|\lto| and |\lfrom| are named after |\land| and |\lor|. +\begin{lstlisting} +\[A\lto B\qquad C\lfrom D\qquad E\iff G\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[A\lto B\qquad C\lfrom D\qquad E\iff G\] +\end{macroexample} + +\hspace*{0.14\textwidth}|\plto| and |\plfrom| are the same as in the example below:\\ +\indent\hspace*{0.14\textwidth}(The ``p'' is named after ``phantom''.) +\begin{lstlisting} +\begin{align*} +&\peq A\\ +&=B +\end{align*} +\begin{align*} +&\piff A\\ +&\iff B +\end{align*} +\end{lstlisting} + +\begin{macroexample} +\begin{align*} +&\peq A\\ +&=B +\end{align*} +\begin{align*} +&\piff A\\ +&\iff B +\end{align*} +\end{macroexample} + +\newpage +\begin{lstlisting} +\[\set{x}{x\geqq\frac{1}{2}}\] +\end{lstlisting} + +\begin{macroexample} +\linesmash +\[\set{x}{x\geqq\frac{1}{2}}\] +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[setcolon]| is loaded:\\ +\begin{macroexample} +\linesmash +\DeclareRobustCommand{\set}[2]{\left\{\,#1\;;\;#2\,\right\}} +\[\set{x}{x\geqq\frac{1}{2}}\] +\end{macroexample} + +\begin{lstlisting} +\[\N\NZ\NP\Z\Q\R\C\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[\N\NZ\NP\Z\Q\R\C\] +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[mathbb]| is loaded:\\ +\begin{macroexample} +\linesmash\linesmash +\DeclareRobustCommand{\N}{\ensuremath{\mathbb{N}}} +\DeclareRobustCommand{\NZ}{\ensuremath{\mathbb{N}_{0}}} +\DeclareRobustCommand{\NP}{\ensuremath{\mathbb{N}_{+}}} +\DeclareRobustCommand{\Z}{\ensuremath{\mathbb{Z}}} +\DeclareRobustCommand{\Q}{\ensuremath{\mathbb{Q}}} +\DeclareRobustCommand{\R}{\ensuremath{\mathbb{R}}} +\DeclareRobustCommand{\C}{\ensuremath{\mathbb{C}}} +\DeclareRobustCommand{\set}[2]{\left\{\,#1\;;\;#2\,\right\}} +\[\N\NZ\NP\Z\Q\R\C\] +\end{macroexample} + +\begin{lstlisting} +\[\inverse{f}(x)\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[\inverse{f}(x)\] +\end{macroexample} + +\begin{lstlisting} +\[\abs{\frac{1}{2}}\qquad\abs*{\frac{1}{2}}\] +\end{lstlisting} + +\begin{macroexample} +\linesmash +\[\abs{\frac{1}{2}}\qquad\abs*{\frac{1}{2}}\] +\end{macroexample} + +\newpage +\indent\hspace*{0.14\textwidth}The default of optional argument is |align*|: +\begin{lstlisting} +\begin{ecases}{f(x)} +x&\condition{$x\geqq0$}\\ +-x&\condition{$x<0$} +\end{ecases} +\begin{ecases}[gather]{f(x)} +x\ \condition{$x\geqq0$}\\ +-x\ \condition{$x<0$} +\end{ecases} +\end{lstlisting} + +\begin{macroexample} +\begin{ecases}{f(x)} +x&\condition{$x\geqq0$}\\ +-x&\condition{$x<0$} +\end{ecases}\linesmash +\begin{ecases}[gather]{f(x)} +x\ \condition{$x\geqq0$}\\ +-x\ \condition{$x<0$} +\end{ecases} +\end{macroexample} + +\indent\hspace*{0.14\textwidth}The default of optional argument is |gather*|: +\begin{lstlisting} +\begin{simul} +2x+2y=0\\ +x-y=0 +\end{simul} +\begin{simul}[align] +2x+2y&=0\\ +x-y&=0 +\end{simul} +\end{lstlisting} + +\begin{macroexample} +\begin{simul} +2x+2y=0\\ +x-y=0 +\end{simul}\linesmash +\begin{simul}[align] +2x+2y&=0\\ +x-y&=0 +\end{simul} +\end{macroexample} + +\newpage +\hspace*{0.14\textwidth}The internal environment is an |array| environment: +\begin{lstlisting} +\begin{signchart}{3} +x&1&\cdots&2\\\hline +f(x)&0&\neconcave&1 +\end{signchart} +\begin{signchart}{5} +x&1&\cdots&2&\cdots&3\\\hline +f(x)&0&\neconcave&1&\neconvex&2 +\end{signchart} +\end{lstlisting} + +\begin{macroexample} +\begin{signchart}{3} +x&1&\cdots&2\\\hline +f(x)&0&\nearrow&1 +\end{signchart} +\begin{signchart}{5} +x&1&\cdots&2&\cdots&3\\\hline +f(x)&0&\neconcave&1&\neconvex&2 +\end{signchart} +\end{macroexample} + +\begin{lstlisting} +\underline{% +\neconcave\ \seconcave\ \seconvex\ \neconvex +\quad +\neconcave*\ \seconcave*\ \seconvex*\ \neconvex*} +\end{lstlisting} + +\begin{macroexample} +\underline{% +\neconcave\ \seconcave\ \seconvex\ \neconvex +\quad +\neconcave*\ \seconcave*\ \seconvex*\ \neconvex*} +\end{macroexample} + +\linespace +\begin{lstlisting} +$\dint_{a}^{b}f(x)\dx+\int_{a}^{b}f(x)\dx$\\ +${\dint_{a}^{b}f(x)\dx}+\int_{a}^{b}f(x)\dx$ +\end{lstlisting} + +\begin{macroexample} +$\dint_{a}^{b}f(x)\dx+\int_{a}^{b}f(x)\dx$\\ +${\dint_{a}^{b}f(x)\dx}+\int_{a}^{b}f(x)\dx$ +\end{macroexample} + +\begin{lstlisting} +$f(x)dx+f(x)\dx$, $\dr\ds\dt\du\dx\dy\dz\dtheta$, +$\dint\dtheta=\theta+\const$ +\end{lstlisting} + +\begin{macroexample} +$f(x)dx+f(x)\dx$, $\dr\ds\dt\du\dx\dy\dz\dtheta$, +$\dint\dtheta=\theta+\const$ +\end{macroexample} + +\newpage +\begin{lstlisting} +$\defint{0}{1}{x} ++\defint{0}{1}{\left(\frac{x}{2}\right)^{\frac{1}{2}}}$ +\end{lstlisting} + +\begin{macroexample} +$\defint{0}{1}{x} ++\defint{0}{1}{\left(\frac{x}{2}\right)^{\frac{1}{2}}}$ +\end{macroexample} + +\begin{lstlisting} +\transformvariable{x}{1}{2}{t}{0}{1} +\end{lstlisting} + +\begin{macroexample} +\transformvariable{x}{1}{2}{t}{0}{1} +\end{macroexample} + +\begin{lstlisting} +$\rvec{1}{2}$, $\rvec*{1}{2}{3}$ +\end{lstlisting} + +\begin{macroexample} +$\rvec{1}{2}$, $\rvec*{1}{2}{3}$ +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[rvecbracket]| is loaded:\\ +\begin{macroexample} +$\left[1,\,2\right]$, $\left[1,\,2,\,3\right]$ +\end{macroexample} + +\begin{lstlisting} +$\cvec{1}{2}$, $\cvec*{1}{2}{3}$ +\end{lstlisting} + +\begin{macroexample} +$\cvec{1}{2}$, $\cvec*{1}{2}{3}$ +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[cvecbracket]| is loaded:\\ +\begin{macroexample} +$\begin{bmatrix}\,1\,\\\,2\,\end{bmatrix}$, $\begin{bmatrix}\,1\,\\\,2\,\\\,3\,\end{bmatrix}$ +\end{macroexample} + +\newpage +\hspace*{0.14\textwidth}|\inp| is a synonym for |\innerproduct|. +\begin{lstlisting} +$\innerproduct{\vec{a}}{\frac{\vec{b}}{2}} +=\inp{\vec{a}}{\frac{\vec{b}}{2}}$, +$\innerproduct*{\vec{a}}{\frac{\vec{b}}{2}}$ +\end{lstlisting} + +\begin{macroexample} +$\innerproduct{\vec{a}}{\frac{\vec{b}}{2}} +=\inp{\vec{a}}{\frac{\vec{b}}{2}}$, +$\innerproduct*{\vec{a}}{\frac{\vec{b}}{2}}$ +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[innerproductbracket]| is loaded:\\ +\begin{macroexample} +$\left\langle \vec{a}\relax,\frac{\vec{b}}{2}\right\rangle +=\left\langle \vec{a}\relax,\frac{\vec{b}}{2}\right\rangle$, +$\langle \vec{a}\relax,\frac{\vec{b}}{2}\rangle$ +\end{macroexample} + +\hspace*{0.14\textwidth}|\seq| is a synonym for |\sequence|. +\begin{lstlisting} +$\sequence{a_{n}}=\seq{a_{n}}$ +\end{lstlisting} + +\begin{macroexample} +$\sequence{a_{n}}=\seq{a_{n}}$ +\end{macroexample} + +\begin{lstlisting} +\[\sum*_{k=1}^{n}\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[\sum*_{k=1}^{n}\] +\end{macroexample} + +\begin{lstlisting} +$\GCD\pair{1}{2}$, $\LCM\pair{1}{2}$ +\end{lstlisting} + +\begin{macroexample} +$\GCD\pair{1}{2}$, $\LCM\pair{1}{2}$ +\end{macroexample} + +\begin{lstlisting} +$30\degree$ +\end{lstlisting} + +\begin{macroexample} +$30\degree$ +\end{macroexample} + +\hspace*{0.14\textwidth}This code is by \href{http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc}{Prof. Shingo SAITO}. +\begin{lstlisting} +$\arc{\AA\BB}$, $\arc{\AA\BB\CC\DD}$ +\end{lstlisting} + +\begin{macroexample} +$\arc{\AA\BB}$, $\arc{\AA\BB\CC\DD}$ +\end{macroexample} + +\newpage +\hspace*{0.14\textwidth}This code is by \href{https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html}{Mr./Ms. Ohishi}. +\begin{lstlisting} +$l\parallel m$, $l\notparallel n$, $l\originalparallel m$ +\end{lstlisting} + +\begin{macroexample} +$l\parallel m$, $l\notparallel n$, $l\originalparallel m$ +\end{macroexample} + +\indent\hspace*{0.14\textwidth}The default of optional argument is |1.3|: +\begin{lstlisting} +$\triangle\AA\BB\CC\similar\triangle\AA\BB\CC$, +$\triangle\AA\BB\CC[1.1]\similar\triangle\AA\BB\CC$ +\end{lstlisting} + +\begin{macroexample} +$\triangle\AA\BB\CC\similar\triangle\AA\BB\CC$, +$\triangle\AA\BB\CC\similar[1.1]\triangle\AA\BB\CC$ +\end{macroexample} + +\hspace*{0.14\textwidth}|\homogeneous| is a synonym for |\repeatedcombination|. +\begin{lstlisting} +$\permutation{n}{r}+ +\combination{n}{r}+ +\repeatedpermutation{n}{r}+ +\repeatedcombination{n}{r}$ +$\homogeneous{n}{r}$ +\end{lstlisting} + +\begin{macroexample} +$\permutation{n}{r}+ +\combination{n}{r}+ +\repeatedpermutation{n}{r}+ +\repeatedcombination{n}{r}$ +$\homogeneous{n}{r}$ +\end{macroexample} + +\begin{lstlisting} +$\expectedvalue{P}$ +\end{lstlisting} + +\begin{macroexample} +$\expectedvalue{P}$ +\end{macroexample} + +\linesmash\linesmash +\indent\hspace*{0.14\textwidth}When |[mathbb]| is loaded:\\ +\begin{macroexample} +$\mathbb{E}\left(P\right)$ +\end{macroexample} + +\begin{lstlisting} +$\Re z+\Im z+\originalRe z+\originalIm z$ +\end{lstlisting} + +\begin{macroexample} +$\Re z+\Im z+\originalRe z+\originalIm z$ +\end{macroexample} + +\hspace*{0.14\textwidth}|\conj| is a synonym for |\conjugate|. +\begin{lstlisting} +$\conjugate{a}+\conjugate{b}=\conj{a}+\conj{b}$ +\end{lstlisting} + +\begin{macroexample} +$\conjugate{a}+\conjugate{b}=\conj{a}+\conj{b}$ +\end{macroexample} + +\newpage +\begin{lstlisting} +a\parentext{a}\squaretext{a}\whitesquaretext{a}\\ +$a\parentext{a}\squaretext{a}\whitesquaretext{a}$ +\end{lstlisting} + +\begin{macroexample} +a\parentext{a}\squaretext{a}\whitesquaretext{a}\\ +$a\parentext{a}\squaretext{a}\whitesquaretext{a}$ +\end{macroexample} + +\hspace*{0.14\textwidth}|\ltext| and |\lltext| are named after |\land| and |\lor|. +\begin{lstlisting} +$a\iff\ltext{a}\iff\lltext{a}$ +\end{lstlisting} + +\begin{macroexample} +$a\iff\ltext{a}\iff\lltext{a}$ +\end{macroexample} + +\begin{lstlisting} +\begin{align*} +A +&=\ltextbegin\text{a long long long long long long}\\ +&\phantom{=\ltextbegin}\text{long long text}\ltextend\\ +&=\lltextbegin\text{a long long long long long long}\\ +&\phantom{=\lltextbegin}\text{long long text}\lltextend +\end{align*} +\end{lstlisting} + +\begin{macroexample} +\begin{align*} +A +&=\ltextbegin\text{a long long long long long long}\\ +&\phantom{=\ltextbegin}\text{long long text}\ltextend\\ +&=\lltextbegin\text{a long long long long long long}\\ +&\phantom{=\lltextbegin}\text{long long text}\lltextend +\end{align*} +\end{macroexample} + +\begin{lstlisting} +$a=\nomination{a}$ +\end{lstlisting} + +\begin{macroexample} +$a=\nomination{a}$ +\end{macroexample} + +\newpage +\begin{lstlisting} +\[f(x)= +\begin{dcases} +x&\condition{$x\geqq0$}\\ +-x&\condition{$x<0$} +\end{dcases} +\] +\begin{ecases}{f(x)} +x&\condition*{$x\geqq0$}\\ +-x&\condition*{$x<0$} +\end{ecases} +\end{lstlisting} + +\begin{macroexample} +\[f(x)= +\begin{dcases} +x&\condition{$x\geqq0$}\\ +-x&\condition{$x<0$} +\end{dcases} +\] +\begin{ecases}{f(x)} +x&\condition*{$x\geqq0$}\\ +-x&\condition*{$x<0$} +\end{ecases} +\end{macroexample} + +\begin{lstlisting} +\[A=B\quad\explanation{$A=B$}\] +\begin{align*} +A +&=B&\explanation{$A=B$}\\ +&=C&\explanation*{$B=C$} +\end{align*} +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[A=B\quad\explanation{$A=B$}\] +\begin{align*} +A +&=B&\explanation{$A=B$}\\ +&=C&\explanation*{$B=C$} +\end{align*} +\end{macroexample} + +\begin{lstlisting} +\[\quantify{For any real number $x$,}x=1.\] +\end{lstlisting} + +\begin{macroexample} +\linesmash\linesmash +\[\quantify{For any real number $x$,}x=1.\] +\end{macroexample} + +\begin{lstlisting} +$a=1\equationunit{kgw}$ +\end{lstlisting} + +\begin{macroexample} +$a=1\equationunit{kgw}$ +\end{macroexample} + +\begin{lstlisting} +a \texttherefore\ b \textbecause\ c, +a $\therefore$ b $\because$ c +\end{lstlisting} + +\begin{macroexample} +a \texttherefore\ b \textbecause\ c, +a $\therefore$ b $\because$ c +\end{macroexample} + +\begin{lstlisting} +a \texttherefore\ b \textbecause\ c, +a $\therefore$ b $\because$ c +\end{lstlisting} + +\begin{macroexample} +a \texttherefore\ b \textbecause\ c, +a $\therefore$ b $\because$ c +\end{macroexample} + +\begin{lstlisting} +It follows that the number of primes is infinite.\QED +\end{lstlisting} + +\begin{macroexample} +It follows that the number of primes is infinite.\QED +\end{macroexample} + +\begin{translateing} +|\arc| is by \href{http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc}{Prof. Shingo SAITO}. +I would like to thank him. + +|\arc|は\href{http://www.artsci.kyushu-u.ac.jp/~ssaito/jpn/tex/tips/misc.html#arc}{斎藤新悟氏}によるものです。お礼申しあげます。 + +|\parallel| is by \href{https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html}{Mr./Ms. Ohishi}. +I would like to thank him/her. + +|\parallel|は\href{https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/8814.html}{大石氏}によるものです。お礼申しあげます。 + +This package is inspired by \href{http://emath.s40.xrea.com/}{emath package by Kazuhiro Okuma (a.k.a. tDB)}. +I would like to thank him. + +このパッケージは,\href{http://emath.s40.xrea.com/}{大熊一弘(tDB)氏によるemath}の影響を受けています。お礼申しあげます。 +\end{translateing} + +\psuedosection{moreinfo}{For More Information}{問い合わせ・詳しくは} + +\noindent\hspace*{\fill}\begin{tabular}{rl} +\multicolumn{2}{l}{The jpnedumathsymbols package:}%& +\\% +\multicolumn{2}{r}{\hspace{8\zw}\url{https://www.metaphysica.info/technote/package_jpnedumathsymbols/}}\\ +Yukoh KUSAKABE:&\url{https://www.metaphysica.info/}\\ +&\url{https://twitter.com/metaphysicainfo}\\ +&(screen-name, 日下部幽考 in Japanese) +\end{tabular}\hspace*{\fill} +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.pdf b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.pdf Binary files differdeleted file mode 100644 index 6b60510e28..0000000000 --- a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.pdf +++ /dev/null diff --git a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.tex b/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.tex deleted file mode 100644 index c9debf3c32..0000000000 --- a/macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.tex +++ /dev/null @@ -1,132 +0,0 @@ -\documentclass[uplatex]{jsarticle} -\usepackage{jpnedumathsymbols} -\begin{document} -\setlength{\baselineskip}{2em} -A$\frac{1}{2}$B - -A$\sqrt[3]{2}$B - -A$\lim_{x\to 1}$B - -A$\vec{a}+\vec{B}$B - -$\triangle\AA\BB\CC$ - -数学\currIA - -$a\comma b$ - -$a\period$ - -$\pair{1}{2}$ $\triplet{1}{2}{3}$ $\quadruplet*{1}{2}{3}{4}$ - -$A\intersection B$ $C\union D$ - -$\complement{A}$ - -$A\tand B$ $A\tor B$ - -$A\eand B$ $A\eor B$ - -$A\lto B\lfrom C\iff D$ - -\begin{align*} -&\piff A\\ -&\iff B -\end{align*} - -$A=B$ - -\begin{align*} -&\peq A\\ -&=B -\end{align*} - -$\set{A}{B}$ - -$\N \NZ \NP \Z \Q \R \C$ - -$\inverse{f}$ - -$\abs{\frac{1}{2}} \abs*{\frac{1}{2}}$ - -\begin{ecases}{A} -B\\ -C -\end{ecases} - -\begin{simul} -A=A\\ -B=B -\end{simul} - -\begin{signchart}{3} -x&1&\cdots&2\\\hline -\phantomheight f(x)&0&\neconcave&1 -\end{signchart} - -$\dint\dtheta=\theta+\const$ - -$\dint_{1}^{2}\dx=\defint{1}{2}{x}$ - -\transformvariable{x}{1}{2}{t}{0}{1} - -$\rvec{1}{2}$ $\rvec*{1}{2}{3}$ - -$\cvec{1}{2}$ $\cvec*{1}{2}{3}$ - -$\innerproduct{\vec{a}}{\vec{b}}$ - -$\sequence{a_{n}}$ - -\[\sum*_{k=1}^{n}\] - -$\GCD\pair{1}{2}$ $\LCM\pair{1}{2}$ - -$30\degree$ - -$\arc{\AA\BB}$ - -$l\parallel m$ - -$\triangle\AA\BB\CC\similar\triangle\AA\BB\CC$ - -$\permutation{n}{r} \combination{n}{r} \repeatedpermutation{n}{r} \repeatedcombination{n}{r}$ - -$\expectedvalue{P}$ - -$\Re \Im$ - -$\conjugate{\alpha}$ - -$a \parentext{a} \squaretext{a} \whitesquaretext{a}$ - -$a \ltext{a} \lltext{a}$ - -$\ltextbegin \lltextbegin \ltextend \lltextend$ - -$a=\nomination{a}$ - -\[ -A= -\begin{dcases} -B&\condition{b}\\ -C&\condition{c} -\end{dcases} -\] - -\begin{ecases}{A} -B&\condition*{b}\\ -C&\condition*{c} -\end{ecases} - -$a\explanation{a}$ - -$\quantify{任意の実数$x$に対し}x=1$ - -$a=1\equationunit{kgw}$ - -a \texttherefore\ b \textbecause\ c - -\QED -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/pdfpc/README.md b/macros/latex/contrib/pdfpc/README.md index 36c6a8bb65..60311000b1 100644 --- a/macros/latex/contrib/pdfpc/README.md +++ b/macros/latex/contrib/pdfpc/README.md @@ -9,6 +9,7 @@ console (pdfpc) program. `pdfpc` depends on these packages: [`kvoptions`](https://ctan.org/pkg/kvoptions), [`xstring`](https://ctan.org/pkg/xstring), +[`iftex`](https://ctan.org/pkg/iftex), [`hyperxmp`](https://ctan.org/pkg/hyperxmp) ## Usage @@ -16,19 +17,3 @@ console (pdfpc) program. It's best to read the [`pdfpc`](https://github.com/pdfpc/pdfpc) documentation for `pdfpc` integration. -## License - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - diff --git a/macros/latex/contrib/pdfpc/pdfpc-doc.pdf b/macros/latex/contrib/pdfpc/pdfpc-doc.pdf Binary files differindex 94321f63a5..dc6c357667 100644 --- a/macros/latex/contrib/pdfpc/pdfpc-doc.pdf +++ b/macros/latex/contrib/pdfpc/pdfpc-doc.pdf diff --git a/macros/latex/contrib/pdfpc/pdfpc-doc.tex b/macros/latex/contrib/pdfpc/pdfpc-doc.tex index c700b45411..f4b959c6b6 100644 --- a/macros/latex/contrib/pdfpc/pdfpc-doc.tex +++ b/macros/latex/contrib/pdfpc/pdfpc-doc.tex @@ -14,21 +14,21 @@ % You should have received a copy of the GNU General Public License along % with this program; if not, write to the Free Software Foundation, Inc., % 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -% ------------------------------------------------------------------------------------------- +% ----------------------------------------------------------------------------- % % Allow for defining some meta data and simple textual notes for use % with the pdfpc presentation application <https://pdfpc.github.io>. % -% ------------------------------------------------------------------------------------------- +% ----------------------------------------------------------------------------- % % Inspired by Carsten Brandt's <https://github.com/cebe/pdfpc-latex-notes>. % -% ------------------------------------------------------------------------------------------- +% ----------------------------------------------------------------------------- % % Please report bugs and other problems as well as suggestions for improvements % to the issue tracker at github <https://github.com/pdfpc/pdfpc/> % -% ------------------------------------------------------------------------------------------- +% ----------------------------------------------------------------------------- \documentclass[11pt]{ltxdoc} \usepackage{iftex} @@ -38,12 +38,14 @@ \usepackage{hyperref} \newcommand*{\sty}[1]{\textsf{#1}} -\def\param#1{\textit{\rmfamily\mdseries\ensuremath{\langle}#1\ensuremath{\rangle}}} +\def\param#1% +{\textit{\rmfamily\mdseries\ensuremath{\langle}#1\ensuremath{\rangle}}} -\title{The \sty{pdfpc} package \\ {\large\url{https://github.com/pdfpc/pdfpc}}} +\title{The \sty{pdfpc} package \\ + {\large\url{https://github.com/pdfpc/latex-pdfpc}}} \author{Evgeny Stambulchik} -\date{2021/02/06 (v0.6.0)} +\date{2022/07/05 (v0.7.0)} \hypersetup{pdftitle={The pdfpc package}, pdfauthor={Evgeny Stambulchik}} @@ -52,10 +54,10 @@ \thispagestyle{empty} \begin{abstract} -This package provides a convenient way to specify notes and to define certain -meta properties of the presentation when used with +This package provides a convenient way to specify notes and to define certain +meta properties of the presentation when used with \href{https://pdfpc.github.io/}{PDF Presenter Console (\texttt{pdfpc}), a -GPLv2+ licensed multi-monitor PDF presentation viewer application available on +GPLv3+ licensed multi-monitor PDF presentation viewer application available on GitHub}\footnote{\url{https://pdfpc.github.io/}}. \end{abstract} @@ -72,7 +74,7 @@ kvoptions \\ xstring \\ iftex \\ hyperxmp \section*{License} -\textcopyright\ 2020 Evgeny Stambulchik +\textcopyright\ 2020--2022 Evgeny Stambulchik This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,9 +84,9 @@ the Free Software Foundation; either version 3 of the License, or This work consists of the following files: \begin{itemize} - \item "pdfpc.sty", - \item "pdfpc-doc.tex" - \item "pdfpc-doc.pdf" \emph{(compiled)} + \item ``pdfpc.sty'' + \item ``pdfpc-doc.tex'' + \item ``pdfpc-doc.pdf'' \emph{(compiled)} \end{itemize} \clearpage @@ -92,9 +94,10 @@ This work consists of the following files: \part{The documentation} \section*{Loading \sty{pdfpc}} -Load \sty{pdfpc} by adding \cmd{\usepackage\{pdfpc\}} to your preamble. +Load \sty{pdfpc} by adding \cmd{\usepackage[\param{options}]\{pdfpc\}} to your +preamble. -The following \param{options} may be given as comma-separated list: +The following options may be given as comma-separated list: \begin{itemize} \item \texttt{duration} @@ -108,6 +111,8 @@ The following \param{options} may be given as comma-separated list: \item \texttt{defaulttransition} (needs pdfpc v4.5 or higher) \end{itemize} +Alternatively, the options can be set using the \cmd{\pdfpcsetup} command +like \cmd{\pdfpcsetup\{\param{option1=value1}[,~\ldots]\}}. The meaning and possible values of most of these options are documented in \textit{pdfpcrc(5)} man page of the pdfpc program. The rest are explained below. diff --git a/macros/latex/contrib/pdfpc/pdfpc.sty b/macros/latex/contrib/pdfpc/pdfpc.sty index 579c35865a..30529d3c11 100644 --- a/macros/latex/contrib/pdfpc/pdfpc.sty +++ b/macros/latex/contrib/pdfpc/pdfpc.sty @@ -30,7 +30,7 @@ % % ------------------------------------------------------------------------------------------- % -\ProvidesPackage{pdfpc}[2021/02/06 v0.6.0 PDFPC] +\ProvidesPackage{pdfpc}[2022/07/05 v0.7.0 PDFPC] \NeedsTeXFormat{LaTeX2e} % % Require additional packages needed by \sty{pdfpc}: @@ -90,6 +90,7 @@ \def\PDFPC@notesposition{auto}% \fi% % +\def\pdfpcsetup{\kvsetkeys{PDFPC}}% % Guesswork for beamer/pgfpages notes \ifx\PDFPC@notesposition\pdfpc@notespositionauto% \def\PDFPC@notesposition{none}% diff --git a/macros/latex/contrib/rerunfilecheck/README.md b/macros/latex/contrib/rerunfilecheck/README.md index 325e343e02..d682698c4d 100644 --- a/macros/latex/contrib/rerunfilecheck/README.md +++ b/macros/latex/contrib/rerunfilecheck/README.md @@ -1,11 +1,16 @@ # rerunfilecheck -rerunfilecheck for LaTeX - +Version: 2022-07-10 v1.10 The package provides additional rerun warnings if some auxiliary files have changed. It is based on MD5 checksum, -provided by pdfTeX. +provided by pdfTeX, luatex, xetex. + +## Copyright (C) +* 2009-2011 Heiko Oberdiek +* 2016-2022 Oberdiek Package Support Group +## License +LATEX Project Public License, version 1.3c or later. diff --git a/macros/latex/contrib/rerunfilecheck/rerunfilecheck.dtx b/macros/latex/contrib/rerunfilecheck/rerunfilecheck.dtx index 1418675669..c0c027d68a 100644 --- a/macros/latex/contrib/rerunfilecheck/rerunfilecheck.dtx +++ b/macros/latex/contrib/rerunfilecheck/rerunfilecheck.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: rerunfilecheck.dtx -% Version: 2019/12/05 v1.9 +% Version: 2022-07-10 v1.10 % Info: Rerun checks for auxiliary files % % Copyright (C) % 2009-2011 Heiko Oberdiek -% 2016-2019 Oberdiek Package Support Group +% 2016-2022 Oberdiek Package Support Group % https://github.com/ho-tex/rerunfilecheck/issues % % This work may be distributed and/or modified under the @@ -82,7 +82,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: rerunfilecheck 2019/12/05 v1.9 Rerun checks for auxiliary files (HO)} +\Msg{* Package: rerunfilecheck 2022-07-10 v1.10 Rerun checks for auxiliary files (HO)} \Msg{************************************************************************} \keepsilent @@ -94,11 +94,11 @@ This is a generated file. Project: rerunfilecheck -Version: 2019/12/05 v1.9 +Version: 2022-07-10 v1.10 Copyright (C) 2009-2011 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2016-2022 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -161,7 +161,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{rerunfilecheck.drv}% - [2019/12/05 v1.9 Rerun checks for auxiliary files (HO)]% + [2022-07-10 v1.10 Rerun checks for auxiliary files (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -175,7 +175,7 @@ and the derived files % \GetFileInfo{rerunfilecheck.drv} % % \title{The \xpackage{rerunfilecheck} package} -% \date{2019/12/05 v1.9} +% \date{2022-07-10 v1.10} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/rerunfilecheck/issues}}} % @@ -355,7 +355,7 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rerunfilecheck}% - [2019/12/05 v1.9 Rerun checks for auxiliary files (HO)] + [2022-07-10 v1.10 Rerun checks for auxiliary files (HO)] % \end{macrocode} % % \subsection{Options} @@ -535,7 +535,7 @@ and the derived files \let\makeglossary\@empty }% \ifx\ReFiCh@temp\makeglossary - \def\ReFiCh@temp{% + \def\makeglossary{% \newwrite\@glossaryfile \RerunFileCheck{\jobname.glo}{% \immediate\closeout\@glossaryfile @@ -716,27 +716,10 @@ and the derived files % \end{description} % % -% \paragraph{Bundle.} All the packages of the bundle `rerunfilecheck' -% are also available in a TDS compliant ZIP archive. There -% the packages are already unpacked and the documentation files -% are generated. The files and directories obey the TDS standard. -% \begin{description} -% \item[\CTANinstall{install/macros/latex/contrib/rerunfilecheck.tds.zip}] -% \end{description} -% \emph{TDS} refers to the standard ``A Directory Structure -% for \TeX\ Files'' (\CTANpkg{tds}). Directories -% with \xfile{texmf} in their name are usually organized this way. -% -% \subsection{Bundle installation} -% -% \paragraph{Unpacking.} Unpack the \xfile{rerunfilecheck.tds.zip} in the -% TDS tree (also known as \xfile{texmf} tree) of your choice. -% Example (linux): -% \begin{quote} -% |unzip rerunfilecheck.tds.zip -d ~/texmf| -% \end{quote} -% % \subsection{Package installation} +% Typically the package should be installed with the package manager of your \TeX-system. +% A manual installation as described below is needed only very rarely and is described +% only for historical reasons. % % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting % \docstrip\ archive. The files are extracted by running the @@ -913,6 +896,9 @@ and the derived files % \item % Documentation updates. % \end{Version} +% \begin{Version}{2022-07-10 v1.10} +% \item Correct glossary option, see github issue \#1 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/macros/latex/contrib/rerunfilecheck/rerunfilecheck.pdf b/macros/latex/contrib/rerunfilecheck/rerunfilecheck.pdf Binary files differindex 1bbf8a13e6..8ba5ce1c16 100644 --- a/macros/latex/contrib/rerunfilecheck/rerunfilecheck.pdf +++ b/macros/latex/contrib/rerunfilecheck/rerunfilecheck.pdf diff --git a/macros/latex/contrib/textcase/textcase.dtx b/macros/latex/contrib/textcase/textcase.dtx index 3fd04e0af9..f857700c81 100644 --- a/macros/latex/contrib/textcase/textcase.dtx +++ b/macros/latex/contrib/textcase/textcase.dtx @@ -13,7 +13,7 @@ %<driver> \ProvidesFile{textcase.drv} % \fi % \ProvidesFile{textcase.dtx} - [2022/06/12 v1.02 Text only upper/lower case changing (DPC)] + [2022/07/10 v1.03 Text only upper/lower case changing (DPC)] % % \iffalse %<*driver> @@ -230,7 +230,7 @@ % % In current \LaTeX\ just define legacy names. % \begin{macrocode} -\ifx\@expl@text@uppercase@@n\@undefined\else +\ifx\AddToNoCaseChangeList\@undefined\else \DeclareOption{overload}{} \ProcessOptions \PackageInfo{textcase}{Defining Legacy names} @@ -278,6 +278,8 @@ % {UTF-8 support for 2022 LaTeX format (unreleased)} % \changes{v1.02}{2022/06/12} % {Obsolete this package in newer formats} +% \changes{v1.02s}{2022/067/10} +% {Adjust test for newer formats} % Allow UTF-8 characters are e-\TeX\ |\protected| in newer \LaTeX\ formats. % % \begin{macrocode} diff --git a/macros/latex/contrib/textcase/textcase.pdf b/macros/latex/contrib/textcase/textcase.pdf Binary files differindex 0d698752a3..4466ef1c08 100644 --- a/macros/latex/contrib/textcase/textcase.pdf +++ b/macros/latex/contrib/textcase/textcase.pdf |