summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/uplatex/base/uplatex.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/uplatex/base/uplatex.dtx')
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplatex.dtx30
1 files changed, 25 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 7f014b8b388..58edbbc69ff 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
@@ -7,7 +7,7 @@
%
% Copyright (c) 2010 ASCII MEDIA WORKS
% Copyright (c) 2016 Takuji Tanaka
-% Copyright (c) 2016-2020 Japanese TeX Development Community
+% Copyright (c) 2016-2021 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
@@ -92,6 +92,7 @@
% (based on platex.dtx 2018/09/22 v1.0y)}
% \changes{v1.0y-u03}{2019/05/22}{ドキュメントを更新}
% \changes{v1.1b-u03}{2020/09/28}{defs読込後にフック追加}
+% \changes{v1.1c-u03}{2021/02/25}{\file{latex.ltx}の読込チェック}
%\else
% \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one
% (based on platex.dtx 1997/01/29 v1.0c)}
@@ -132,6 +133,7 @@
% (based on platex.dtx 2018/09/22 v1.0y)}
% \changes{v1.0y-u03}{2019/05/22}{Update document.}
% \changes{v1.1b-u03}{2020/09/28}{Add hook after loading defs}
+% \changes{v1.1c-u03}{2021/02/25}{Check for \file{latex.ltx} status}
%\fi
% \fi
%
@@ -139,7 +141,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{uplatex.dtx}[2020/09/28 v1.1b-u03 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2021/02/25 v1.1c-u03 upLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -431,8 +433,8 @@
%
%\ifJAPANESE
% \file{latex.ltx}を読み込みます。
-% \TeX\ Liveの標準的インストールでは、この中でBabel由来のハイフネーション・
-% パターン\file{hyphen.cfg}が読み込まれるはずです。
+% \TeX\ Liveの標準的インストールでは、この中でBabel由来の
+% ハイフネーション・パターン\file{hyphen.cfg}が読み込まれるはずです。
%\else
% Load \file{latex.ltx} here.
% Within the standard installation of \TeX\ Live, \file{hyphen.cfg}
@@ -443,6 +445,24 @@
% \end{macrocode}
%
%\ifJAPANESE
+% この時点で|\typeout|が未定義なら、\LaTeX{}カーネルの読み込みに
+% 失敗していますので、強制終了します(\LaTeXe\ 2017/01/01以降を
+% 非\eTeX{}拡張でフォーマット作成しようとした場合など)。
+% \changes{v1.1c-u03}{2021/02/25}{\file{latex.ltx}の読込チェック}
+%\else
+% If |\typeout| is still undefined, the input of \LaTeX~kernel
+% should have failed; abort now.
+% \changes{v1.1c-u03}{2021/02/25}{Check for \file{latex.ltx} status}
+%\fi
+% \begin{macrocode}
+\ifx\typeout\undefined
+ \errhelp{Please reinstall LaTeX, or check e-TeX availability.}%
+ \errmessage{Failed to load `latex.ltx' properly}%
+ \expandafter\end
+\fi
+% \end{macrocode}
+%
+%\ifJAPANESE
% \file{plcore.ltx}と\file{uplcore.ltx}を読み込みます。
% \changes{v1.0s-u02}{2017/12/10}{\file{uplcore.ltx}の前に
% \file{plcore.ltx}を読み込むようにした(最近の\pLaTeX{}が前提)}
@@ -1207,7 +1227,7 @@ echo "" > ltxdoc.cfg
% \begin{thebibliography}{9}
% \bibitem{tb108tanaka}
% Takuji Tanaka,
-% \newblock Up\TeX\ --- Unicode version of \pTeX\ with CJK extensions
+% \newblock Up\TeX\ --- Unicode version of \pTeX\ with CJK extensions.
% \newblock TUGboat issue 34:3, 2013.\\
% (\texttt{http://tug.org/TUGboat/tb34-3/tb108tanaka.pdf})
% \end{thebibliography}