texlive[59450] Master/texmf-dist: uplatex (3jun21)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 3 22:48:40 CEST 2021
Revision: 59450
http://tug.org/svn/texlive?view=revision&revision=59450
Author: karl
Date: 2021-06-03 22:48:40 +0200 (Thu, 03 Jun 2021)
Log Message:
-----------
uplatex (3jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/uplatex/base/LICENSE
trunk/Master/texmf-dist/doc/uplatex/base/README.md
trunk/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf
trunk/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
trunk/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
trunk/Master/texmf-dist/source/uplatex/base/Makefile
trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx
trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
Modified: trunk/Master/texmf-dist/doc/uplatex/base/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/uplatex/base/LICENSE 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/doc/uplatex/base/LICENSE 2021-06-03 20:48:40 UTC (rev 59450)
@@ -1,6 +1,6 @@
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
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: trunk/Master/texmf-dist/doc/uplatex/base/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/uplatex/base/README.md 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/doc/uplatex/base/README.md 2021-06-03 20:48:40 UTC (rev 59450)
@@ -20,6 +20,6 @@
## Release Date
-2020-09-30
+2021-05-31
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/uplatex/base/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/Makefile 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/source/uplatex/base/Makefile 2021-06-03 20:48:40 UTC (rev 59450)
@@ -3,10 +3,14 @@
uplatex-en #upldoc-en
PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
+TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
+
KANJI = -kanji=utf8
#FONTMAP = -f ipaex.map -f uptex-ipaex.map
FONTMAP = -f haranoaji.map -f uptex-haranoaji.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
+LTX = uplatex $(KANJI)
+DPX = dvipdfmx $(FONTMAP)
+MDX = mendex -U
default: $(STRIPTARGET) $(DVITARGET)
strip: $(STRIPTARGET)
@@ -26,24 +30,23 @@
INTRODOC_SRC = uplatex.dtx
-PLDOC_SRC = uplatex.dtx uplvers.dtx uplfonts.dtx \
- ukinsoku.dtx ujclasses.dtx
+PLDOC_SRC = $(PLFMT_SRC) $(PLCLS_SRC)
uplatex.ltx: $(PLFMT_SRC)
rm -f $(PLFMT)
- uplatex $(KANJI) uplfmt.ins
+ $(LTX) uplfmt.ins
rm uplfmt.log
ujarticle.cls: $(PLCLS_SRC)
rm -f $(PLCLS)
- uplatex $(KANJI) uplcls.ins
+ $(LTX) uplcls.ins
rm uplcls.log
uplatex.dvi: $(INTRODOC_SRC)
rm -f uplatex.cfg
- uplatex $(KANJI) uplatex.dtx
- mendex -U -f -s gglo.ist -o uplatex.gls uplatex.glo
- uplatex $(KANJI) uplatex.dtx
+ $(LTX) uplatex.dtx
+ $(MDX) -f -s gglo.ist -o uplatex.gls uplatex.glo
+ $(LTX) uplatex.dtx
rm uplatex.aux uplatex.log
rm uplatex.glo uplatex.gls uplatex.ilg
@@ -50,20 +53,33 @@
upldoc.dvi: $(PLDOC_SRC)
rm -f uplatex.cfg
rm -f upldoc.tex Xins.ins
- uplatex $(KANJI) upldocs.ins
- rm -f mkpldoc*.sh #dstcheck.pl
- uplatex $(KANJI) Xins.ins
- sh mkpldoc.sh
+ $(LTX) upldocs.ins
+ #
+ #rm -f mkpldoc*.sh #dstcheck.pl
+ #$(LTX) Xins.ins
+ #sh mkpldoc.sh
+ #rm mkpldoc*.sh #dstcheck.pl
+ #
+ rm -f upldoc.toc upldoc.idx upldoc.glo
+ echo "" > ltxdoc.cfg
+ $(LTX) upldoc.tex
+ $(MDX) -s gind.ist -d upldoc.dic -o upldoc.ind upldoc.idx
+ $(MDX) -f -s gglo.ist -o upldoc.gls upldoc.glo
+ echo "\includeonly{}" > ltxdoc.cfg
+ $(LTX) upldoc.tex
+ echo "" > ltxdoc.cfg
+ $(LTX) upldoc.tex
+ #
rm *.aux *.log upldoc.toc upldoc.idx upldoc.ind upldoc.ilg
rm upldoc.glo upldoc.gls upldoc.tex Xins.ins
- rm ltxdoc.cfg upldoc.dic mkpldoc*.sh #dstcheck.pl
+ rm ltxdoc.cfg upldoc.dic
uplatex-en.dvi: $(INTRODOC_SRC)
# built-in echo in shell is troublesome, so use perl instead
perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >uplatex.cfg
- uplatex -jobname=uplatex-en $(KANJI) uplatex.dtx
- mendex -U -f -s gglo.ist -o uplatex-en.gls uplatex-en.glo
- uplatex -jobname=uplatex-en $(KANJI) uplatex.dtx
+ $(LTX) -jobname=uplatex-en uplatex.dtx
+ $(MDX) -f -s gglo.ist -o uplatex-en.gls uplatex-en.glo
+ $(LTX) -jobname=uplatex-en uplatex.dtx
rm uplatex-en.aux uplatex-en.log
rm uplatex-en.glo uplatex-en.gls uplatex-en.ilg
rm uplatex.cfg
@@ -72,23 +88,36 @@
# built-in echo in shell is troublesome, so use perl instead
perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >uplatex.cfg
rm -f upldoc.tex Xins.ins
- uplatex $(KANJI) upldocs.ins
- rm -f mkpldoc*.sh #dstcheck.pl
- uplatex $(KANJI) Xins.ins
- sh mkpldoc-en.sh
+ $(LTX) upldocs.ins
+ #
+ #rm -f mkpldoc*.sh #dstcheck.pl
+ #$(LTX) Xins.ins
+ #sh mkpldoc-en.sh
+ #rm mkpldoc*.sh #dstcheck.pl
+ #
+ rm -f upldoc-en.toc upldoc-en.idx upldoc-en.glo
+ echo "" > ltxdoc.cfg
+ $(LTX) -jobname=upldoc-en upldoc.tex
+ $(MDX) -s gind.ist -d upldoc.dic -o upldoc-en.ind upldoc-en.idx
+ $(MDX) -f -s gglo.ist -o upldoc-en.gls upldoc-en.glo
+ echo "\includeonly{}" > ltxdoc.cfg
+ $(LTX) -jobname=upldoc-en upldoc.tex
+ echo "" > ltxdoc.cfg
+ $(LTX) -jobname=upldoc-en upldoc.tex
+ #
rm *.aux *.log upldoc-en.toc upldoc-en.idx upldoc-en.ind upldoc-en.ilg
rm upldoc-en.glo upldoc-en.gls upldoc.tex Xins.ins
- rm ltxdoc.cfg upldoc.dic mkpldoc*.sh #dstcheck.pl
+ rm ltxdoc.cfg upldoc.dic
rm uplatex.cfg
uplatex.pdf: uplatex.dvi
- dvipdfmx $(FONTMAP) $<
+ $(DPX) $<
upldoc.pdf: upldoc.dvi
- dvipdfmx $(FONTMAP) $<
+ $(DPX) $<
uplatex-en.pdf: uplatex-en.dvi
- dvipdfmx $(FONTMAP) $<
+ $(DPX) $<
upldoc-en.pdf: upldoc-en.dvi
- dvipdfmx $(FONTMAP) $<
+ $(DPX) $<
.PHONY: install clean cleanstrip cleanall cleandoc
install:
Modified: trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx 2021-06-03 20:48:40 UTC (rev 59450)
@@ -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).
% --------------------------------------------------------------
@@ -34,6 +34,8 @@
% \changes{v1.0b-u06}{2019/09/22}{バグ回避コードがかえって有害なため除去}
% \changes{v1.0c}{2020/09/28}{！の\cs{inhibitxspcode}を設定}
% \changes{v1.0c-u06}{2020/09/28}{p\LaTeX{}の変更に追随}
+% \changes{v1.0d}{2021/03/04}{：の\cs{inhibitxspcode}と:の\cs{xspcode}を設定}
+% \changes{v1.0d-u06}{2021/03/04}{p\LaTeX{}の変更に追随}
% \fi
%
% \iffalse
@@ -40,7 +42,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{ukinsoku.dtx}[2020/09/28 v1.0c-u06 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2021/03/04 v1.0d-u06 upLaTeX Kernel]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{ukinsoku.dtx}
@@ -158,6 +160,7 @@
% が出ないように、コメントからも削除しました。
% \changes{v1.0b-u03}{2018/04/08}{\LaTeX\ 2018-04-01対策}
%
+% \changes{v1.0d}{2021/03/04}{:の\cs{xspcode}を設定}
% \begin{macrocode}
%%全角文字
\prebreakpenalty`、=10000
@@ -338,6 +341,7 @@
\xspcode`]=2
\xspcode``=1
\xspcode`'=2
+\xspcode`:=2
\xspcode`;=2
\xspcode`,=2
\xspcode`.=2
@@ -487,6 +491,7 @@
% \end{center}
%
% \changes{v1.0c}{2020/09/28}{！の\cs{inhibitxspcode}を設定}
+% \changes{v1.0d}{2021/03/04}{：の\cs{inhibitxspcode}を設定}
% \begin{macrocode}
%%
%% inhibitxspcode
@@ -494,6 +499,7 @@
\inhibitxspcode`。=1
\inhibitxspcode`，=1
\inhibitxspcode`．=1
+\inhibitxspcode`：=1
\inhibitxspcode`；=1
\inhibitxspcode`？=1
\inhibitxspcode`！=1
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx 2021-06-03 20:48:40 UTC (rev 59450)
@@ -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 @@
% \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}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex 2021-06-03 20:48:40 UTC (rev 59450)
@@ -199,6 +199,7 @@
\xspcode`]=2
\xspcode``=1
\xspcode`'=2
+\xspcode`:=2
\xspcode`;=2
\xspcode`,=2
\xspcode`.=2
@@ -337,6 +338,7 @@
\inhibitxspcode`。=1
\inhibitxspcode`，=1
\inhibitxspcode`．=1
+\inhibitxspcode`：=1
\inhibitxspcode`；=1
\inhibitxspcode`？=1
\inhibitxspcode`！=1
Modified: trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx 2021-06-03 20:48:22 UTC (rev 59449)
+++ trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx 2021-06-03 20:48:40 UTC (rev 59450)
@@ -17,6 +17,11 @@
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
+\ifx\typeout\undefined
+ \errhelp{Please reinstall LaTeX, or check e-TeX availability.}%
+ \errmessage{Failed to load `latex.ltx' properly}%
+ \expandafter\end
+\fi
\typeout{**************************^^J%
*^^J%
* making upLaTeX format^^J%
More information about the tex-live-commits
mailing list.