summaryrefslogtreecommitdiff
path: root/language/japanese
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-04 03:02:48 +0000
committerNorbert Preining <norbert@preining.info>2021-06-04 03:02:48 +0000
commita5ae129f3aa3a3a0aeaa21c55b75a1d543fe4111 (patch)
treefe5e1e212aec203e668df8581a17374cdde352a1 /language/japanese
parentd231c6331f53a048d29c2f847254a9f56d5ee2dd (diff)
CTAN sync 202106040302
Diffstat (limited to 'language/japanese')
-rw-r--r--language/japanese/uplatex/LICENSE2
-rw-r--r--language/japanese/uplatex/Makefile79
-rw-r--r--language/japanese/uplatex/README.md2
-rw-r--r--language/japanese/uplatex/ukinsoku.dtx10
-rw-r--r--language/japanese/uplatex/uplatex-en.pdfbin113178 -> 113529 bytes
-rw-r--r--language/japanese/uplatex/uplatex.dtx30
-rw-r--r--language/japanese/uplatex/uplatex.pdfbin190137 -> 191844 bytes
-rw-r--r--language/japanese/uplatex/upldoc.pdfbin473882 -> 473667 bytes
8 files changed, 89 insertions, 34 deletions
diff --git a/language/japanese/uplatex/LICENSE b/language/japanese/uplatex/LICENSE
index 1c7b99eea0..483441bb72 100644
--- a/language/japanese/uplatex/LICENSE
+++ b/language/japanese/uplatex/LICENSE
@@ -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
diff --git a/language/japanese/uplatex/Makefile b/language/japanese/uplatex/Makefile
index 308634974c..8c0b6f5cef 100644
--- a/language/japanese/uplatex/Makefile
+++ b/language/japanese/uplatex/Makefile
@@ -3,10 +3,14 @@ DOCTARGET = uplatex upldoc \
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,44 +30,56 @@ PLCLS_SRC = ujclasses.dtx
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
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 @@ upldoc-en.dvi: $(PLDOC_SRC)
# 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:
diff --git a/language/japanese/uplatex/README.md b/language/japanese/uplatex/README.md
index 5ddabeef57..32e08c56e0 100644
--- a/language/japanese/uplatex/README.md
+++ b/language/japanese/uplatex/README.md
@@ -20,6 +20,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-09-30
+2021-05-31
Japanese TeX Development Community
diff --git a/language/japanese/uplatex/ukinsoku.dtx b/language/japanese/uplatex/ukinsoku.dtx
index 70ce9c1280..a5e55f6148 100644
--- a/language/japanese/uplatex/ukinsoku.dtx
+++ b/language/japanese/uplatex/ukinsoku.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).
% --------------------------------------------------------------
@@ -34,13 +34,15 @@
% \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
%<*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
diff --git a/language/japanese/uplatex/uplatex-en.pdf b/language/japanese/uplatex/uplatex-en.pdf
index 4116f332f0..0aad637ba4 100644
--- a/language/japanese/uplatex/uplatex-en.pdf
+++ b/language/japanese/uplatex/uplatex-en.pdf
Binary files differ
diff --git a/language/japanese/uplatex/uplatex.dtx b/language/japanese/uplatex/uplatex.dtx
index 7f014b8b38..58edbbc69f 100644
--- a/language/japanese/uplatex/uplatex.dtx
+++ b/language/japanese/uplatex/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}
diff --git a/language/japanese/uplatex/uplatex.pdf b/language/japanese/uplatex/uplatex.pdf
index babf5d2202..f9d86526ea 100644
--- a/language/japanese/uplatex/uplatex.pdf
+++ b/language/japanese/uplatex/uplatex.pdf
Binary files differ
diff --git a/language/japanese/uplatex/upldoc.pdf b/language/japanese/uplatex/upldoc.pdf
index 9d719a52f3..3bea6e1bd3 100644
--- a/language/japanese/uplatex/upldoc.pdf
+++ b/language/japanese/uplatex/upldoc.pdf
Binary files differ