texlive[45254] Master/texmf-dist: ifptex (9sep17)
commits+karl at tug.org
commits+karl at tug.org
Sun Sep 10 00:34:52 CEST 2017
Revision: 45254
http://tug.org/svn/texlive?view=revision&revision=45254
Author: karl
Date: 2017-09-10 00:34:52 +0200 (Sun, 10 Sep 2017)
Log Message:
-----------
ifptex (9sep17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/ifptex/README-ja.md
trunk/Master/texmf-dist/doc/generic/ifptex/README.md
trunk/Master/texmf-dist/tex/generic/ifptex/ifptex.sty
trunk/Master/texmf-dist/tex/generic/ifptex/ifuptex.sty
Modified: trunk/Master/texmf-dist/doc/generic/ifptex/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/ifptex/README-ja.md 2017-09-09 22:34:38 UTC (rev 45253)
+++ trunk/Master/texmf-dist/doc/generic/ifptex/README-ja.md 2017-09-09 22:34:52 UTC (rev 45254)
@@ -36,24 +36,34 @@
### 機能
+注意：e-TeX拡張の有無は区別されない。
+
* `\ifpTeX`（又は `\ifptex`）［if-トークン］
- pTeX（upTeX を含む）を使っているか。
+ pTeX（upTeX、pTeX-ng を含む）を使っているか。
* `\ifstrictpTeX`（又は `\ifstrictptex`）［if-トークン］
- pTeX（upTeX ではなく）を使っているか。
+ pTeX（upTeX、pTeX-ng ではなく）を使っているか。
* `\ifupTeX`（又は `\ifuptex`） ［if-トークン］
- upTeX を使っているか。
+ upTeX（pTeX-ng を含む）を使っているか。
+ * `\ifstrictupTeX`（又は `\ifstrictuptex`） ［if-トークン］
+ upTeX（pTeX-ng ではなく）を使っているか。
* `\ifnativeupTeX` ［if-トークン］
upTeX を内部文字コードが Unicode の状態で使っているか。
* `\ifpTeXng`（又は `\ifptexng`）［if-トークン］
- pTeX-ng を使っているか。
+ pTeX-ng を使っているか。
+ ※一応 `\ifstrictpTeXng`（`\ifstrictptexng`）もある。
* `\RequirepTeX`
`\ifpTeX` 不成立の場合はエラーを出す。
+ * `\RequireStirctpTeX`
+ `\ifstrictpTeX` 不成立の場合はエラーを出す。
* `\RequireupTeX`
`\ifupTeX` 不成立の場合はエラーを出す。
+ * `\RequireStrictupTeX`
+ `\ifstrictupTeX` 不成立の場合はエラーを出す。
* `\RequireNativeupTeX`
- `\ifNativeupTeX` 不成立の場合はエラーを出す。
+ `\ifnativeupTeX` 不成立の場合はエラーを出す。
* `\RequirepTeXng`
- `\ifpTeXng` 不成立の場合はエラーを出す。
+ `\ifpTeXng` 不成立の場合はエラーを出す。
+ ※一応 `\RequireStrictpTeXng` もある。
ifuptex パッケージ ― ifptex の別名
@@ -76,6 +86,8 @@
更新履歴
--------
+ * Version 1.2 〈2017/09/09〉
+ - `\ifstrictupTeX`、`\RequireStrictupTeX` を追加。
* Version 1.1 〈2017/05/04〉
- 細かい調整。
* Version 1.0 〈2013/04/29〉
Modified: trunk/Master/texmf-dist/doc/generic/ifptex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/ifptex/README.md 2017-09-09 22:34:38 UTC (rev 45253)
+++ trunk/Master/texmf-dist/doc/generic/ifptex/README.md 2017-09-09 22:34:52 UTC (rev 45254)
@@ -40,12 +40,16 @@
### Usage
+NB: Here “e-TeX-ness” is not considered.
+
* `\ifpTeX` (or `\ifptex`) [if-token]
- Whether the engine is pTeX (or its derivative, including upTeX).
+ Whether the engine is pTeX (including upTeX or pTeX-ng).
* `\ifstrictpTeX` (or `\ifstrictptex`) [if-token]
- Whether the engine is pTeX (or its derivative) but *not* upTeX.
+ Whether the engine is pTeX but *not* upTeX or pTeX-ng.
* `\ifupTeX` (or `\ifuptex`) [if-token]
- Whether the engine is upTeX (or its derivative).
+ Whether the engine is upTeX (including pTeX-ng).
+ * `\ifstrictupTeX` (or `\ifstrictuptex`) [if-token]
+ Whether the engine is upTeX but *not* pTeX-ng.
* `\ifnativeupTeX` [if-token]
Whether the engine is upTeX and its internal encoding is Unicode.
* `\ifpTeXng` (or `\ifptexng`) [if-token]
@@ -56,6 +60,8 @@
Issues an error if `\ifstrictpTeX` fails.
* `\RequireupTeX`
Issues an error if `\ifupTeX` fails.
+ * `\RequireStrictupTeX`
+ Issues an error if `\ifstrictupTeX` fails.
* `\RequireNativeupTeX`
Issues an error if `\ifnativeupTeX` fails.
* `\RequirepTeXng`
@@ -86,6 +92,8 @@
Revision History
----------------
+ * Version 1.2 〈2017/09/09〉
+ - Add `\ifstrictupTeX` and `RequireStrictupTeX`.
* Version 1.1 〈2017/05/04〉
- Minor fix.
* Version 1.0 〈2013/04/29〉
Modified: trunk/Master/texmf-dist/tex/generic/ifptex/ifptex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ifptex/ifptex.sty 2017-09-09 22:34:38 UTC (rev 45253)
+++ trunk/Master/texmf-dist/tex/generic/ifptex/ifptex.sty 2017-09-09 22:34:52 UTC (rev 45254)
@@ -47,7 +47,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ifptex}[2017/05/04 v1.1-pre pTeX checker]
+\ProvidesPackage{ifptex}[2017/09/09 v1.2 pTeX checker]
%% enter the big group
\begingroup
@@ -133,6 +133,13 @@
\fi
%--------------------------------------- public stuffs
+% Note:
+% 1) Names '\ifFooTeX' are used in iftex.
+% 2) Names '\iffootex' are used in ifxetex/ifluatex/....
+% My preferences are:
+% - '\ifwhateverFooTeX' and '\RequireWhateverFooTeX'.
+% But I also provide aliases '\iffootex' and '\ifstrictfootex' for
+% compatibility with 1) and the old ifuptex.
%%<+> \ifpTeX
\global\bxip at false{ifpTeX}
@@ -170,6 +177,19 @@
%%<+> \ifstrictptex == \ifstrictpTeX
\global\bxip at csletcs{ifstrictptex}{ifstrictpTeX}
+%%<+> \ifstrictupTeX
+\global\bxip at false{ifstrictupTeX}
+\ifupTeX \ifpTeXng\else
+ \global\bxip at true{ifstrictupTeX}
+\fi\fi
+%%<+> \ifstrictuptex == \ifstrictupTeX
+\global\bxip at csletcs{ifstrictuptex}{ifstrictupTeX}
+
+%%<+> \ifstrictpTeXng (== \ifpTeXng, for now)
+\global\bxip at csletcs{ifstrictpTeXng}{ifpTeXng}
+%%<+> \ifstrictptexng == \ifstrictpTeXng
+\global\bxip at csletcs{ifstrictptexng}{ifstrictpTeXng}
+
%%<+> \RequirepTeX
\gdef\RequirepTeX{%
\ifpTeX\else \bxip at err@required{(u)pTeX}\fi}
@@ -179,6 +199,9 @@
%%<+> \RequireupTeX
\gdef\RequireupTeX{%
\ifupTeX\else \bxip at err@required{upTeX}\fi}
+%%<+> \RequireStrictupTeX
+\gdef\RequireStrictupTeX{%
+ \ifstrictupTeX\else \bxip at err@required{upTeX (not pTeX-ng)}\fi}
%%<+> \RequireNativeupTeX
\gdef\RequireNativeupTeX{%
\ifnativeupTeX\else \bxip at err@required{upTeX in Unicode}\fi}
@@ -185,6 +208,9 @@
%%<+> \RequirepTeXng
\gdef\RequirepTeXng{%
\ifpTeXng\else \bxip at err@required{pTeX-ng}\fi}
+%%<+> \RequireStrictpTeXng
+\gdef\RequireStrictpTeXng{%
+ \ifstrictpTeXng\else \bxip at err@required{pTeX-ng}\fi}
%--------------------------------------- deprecated stuffs
Modified: trunk/Master/texmf-dist/tex/generic/ifptex/ifuptex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ifptex/ifuptex.sty 2017-09-09 22:34:38 UTC (rev 45253)
+++ trunk/Master/texmf-dist/tex/generic/ifptex/ifuptex.sty 2017-09-09 22:34:52 UTC (rev 45254)
@@ -43,10 +43,10 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ifuptex}[2017/05/04 v1.1-pre upTeX checker]
+\ProvidesPackage{ifuptex}[2017/09/09 v1.2 upTeX checker]
%% load ifptex
-\x\RequirePackage{ifptex}[2017/05/04]
+\x\RequirePackage{ifptex}[2017/09/09]
%% all done
\bxip at up@restore at codes
More information about the tex-live-commits
mailing list