texlive[50811] Master/texmf-dist: uplatex (6apr19)
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 6 23:07:49 CEST 2019
Revision: 50811
http://tug.org/svn/texlive?view=revision&revision=50811
Author: karl
Date: 2019-04-06 23:07:49 +0200 (Sat, 06 Apr 2019)
Log Message:
-----------
uplatex (6apr19)
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/upldoc.pdf
trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplcls.ins
trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx
trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
trunk/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
trunk/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
trunk/Master/texmf-dist/tex/uplatex/base/ujbook.cls
trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls
trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
trunk/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
trunk/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls
trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo
trunk/Master/texmf-dist/tex/uplatex/base/utbk11.clo
trunk/Master/texmf-dist/tex/uplatex/base/utbk12.clo
trunk/Master/texmf-dist/tex/uplatex/base/utbook.cls
trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls
trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo
trunk/Master/texmf-dist/tex/uplatex/base/utsize11.clo
trunk/Master/texmf-dist/tex/uplatex/base/utsize12.clo
Modified: trunk/Master/texmf-dist/doc/uplatex/base/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/uplatex/base/LICENSE 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/doc/uplatex/base/LICENSE 2019-04-06 21:07:49 UTC (rev 50811)
@@ -1,6 +1,6 @@
Copyright (c) 2010 ASCII MEDIA WORKS
Copyright (c) 2016 Takuji Tanaka
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2019 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 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/doc/uplatex/base/README.md 2019-04-06 21:07:49 UTC (rev 50811)
@@ -17,6 +17,6 @@
## Release Date
-2018-12-01
+2019-04-06
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx 2019-04-06 21:07:49 UTC (rev 50811)
@@ -7,7 +7,7 @@
%
% Copyright (c) 2010 ASCII MEDIA WORKS
% Copyright (c) 2016 Takuji Tanaka
-% Copyright (c) 2016-2018 Japanese TeX Development Community
+% Copyright (c) 2016-2019 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
@@ -110,6 +110,8 @@
% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
% (sync with ltsect.dtx 2018/09/26 v1.1c)}
% \changes{v1.8a-u00}{2018/10/25}{p\LaTeX{}用に追随}
+% \changes{v1.8b}{2019/04/02}{新元号対応}
+% \changes{v1.8b-u00}{2019/04/02}{p\LaTeX{}用に追随}
% \fi
%
% \iffalse
@@ -139,7 +141,7 @@
%<11pt&bk>\ProvidesFile{utbk11.clo}
%<12pt&bk>\ProvidesFile{utbk12.clo}
%</tate>
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
%<article|report|book> Standard upLaTeX class]
%<10pt|11pt|12pt> Standard upLaTeX file (size option)]
%<*driver>
@@ -4378,6 +4380,7 @@
%
% \begin{macro}{\heisei}
% \changes{v1.1m}{1998/04/07}{\cs{today}の計算手順を変更}
+% \changes{v1.8b}{2019/04/02}{\cs{heisei}の値は$\mbox{西暦}-1988$で固定}
% |\today|コマンドを|\rightmark|で指定したとき、|\rightmark|を出力する部分
% で和暦のための計算ができないので、クラスファイルを読み込む時点で計算して
% おきます。
@@ -4387,32 +4390,46 @@
% \end{macro}
%
% \begin{macro}{\today}
-% 縦組の場合は、漢数字で出力します。
+% \begin{macro}{\pltx at today@year}
+% \changes{v1.8b}{2019/04/02}{\cs{today}の計算・出力方法を変更。}
+% 縦組の場合は、漢数字で出力します
+% \pLaTeX\ 2018-12-01以前では縦数式ディレクション時でも漢数字で出力していましたが、
+% \pLaTeX\ 2019-04-06以降からはそうしなくなりました。
% \begin{macrocode}
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
%
%
Modified: trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx 2019-04-06 21:07:49 UTC (rev 50811)
@@ -7,7 +7,7 @@
%
% Copyright (c) 2010 ASCII MEDIA WORKS
% Copyright (c) 2016 Takuji Tanaka
-% Copyright (c) 2016-2018 Japanese TeX Development Community
+% Copyright (c) 2016-2019 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
@@ -29,6 +29,7 @@
% Latin-1 Supplementのうち属性がLatinのもの
% (Latin-1 letters)をコードポイントで指定}
% \changes{v1.0b-u03}{2018/04/08}{\LaTeX\ 2018-04-01対策}
+% \changes{v1.0b-u04}{2019/01/29}{内部Unicode化されていることを確認}
% \fi
%
% \iffalse
@@ -35,7 +36,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{ukinsoku.dtx}[2018/04/08 v1.0b-u03 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2019/01/29 v1.0b-u04 upLaTeX Kernel]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{ukinsoku.dtx}
@@ -56,10 +57,19 @@
% なお、このファイルのコード部分は、
% p\TeX{}やp\LaTeX{}で配布されている\file{kinsoku.tex}に、
% JIS X 0213の定義文字などの設定を追加したものです。
+% このファイルは内部コードUnicode (|uptex|)なup\TeX{}エンジンで読まれる
+% 必要があります。
% \changes{v1.0-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
+% \changes{v1.0b-u04}{2019/01/29}{内部コードがUnicodeであることを確認}
%
% \begin{macrocode}
%<*plcore>
+\ifnum\ucs"3000="3000 \else
+ \errhelp{Please try to run (e)uptex with option
+ `-kanji-internal=uptex'.}%
+ \errmessage{This file should be read with
+ internal Kanji encoding Unicode}\@@end
+\fi
% \end{macrocode}
%
% \section{禁則}
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplcls.ins
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplcls.ins 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplcls.ins 2019-04-06 21:07:49 UTC (rev 50811)
@@ -9,7 +9,7 @@
Copyright (c) 2010 ASCII MEDIA WORKS
Copyright (c) 2016 Takuji Tanaka
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2019 Japanese TeX Development Community
This file is part of the upLaTeX2e system (community edition).
--------------------------------------------------------------
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2019-04-06 21:07:49 UTC (rev 50811)
@@ -7,7 +7,7 @@
%
% Copyright (c) 2010 ASCII MEDIA WORKS
% Copyright (c) 2016 Takuji Tanaka
-% Copyright (c) 2016-2018 Japanese TeX Development Community
+% Copyright (c) 2016-2019 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujarticle}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -771,27 +771,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk10.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujbk11.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk11.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk11.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujbk12.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk12.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk12.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujbook.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbook.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujbook}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -874,27 +874,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujreport}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -870,27 +870,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize10.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujsize11.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize11.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize11.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujsize12.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize12.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize12.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex 2019-04-06 21:07:49 UTC (rev 50811)
@@ -14,6 +14,12 @@
%% --------------------------------------------------------------
%%
%% File: ukinsoku.dtx
+\ifnum\ucs"3000="3000 \else
+ \errhelp{Please try to run (e)uptex with option
+ `-kanji-internal=uptex'.}%
+ \errmessage{This file should be read with
+ internal Kanji encoding Unicode}\@@end
+\fi
%%
%% 行頭、行末禁則パラメータ
%%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utarticle}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -775,27 +775,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk10.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utbk11.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk11.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk11.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utbk12.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk12.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk12.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utbook.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbook.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utbook}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -878,27 +878,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utreport}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -874,27 +874,36 @@
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
-\def\today{{%
- \iftdir
- \if西暦
- \kansuji\number\year 年
- \kansuji\number\month 月
- \kansuji\number\day 日
+\def\pltx at today@year@#1{%
+ \ifnum\numexpr\year-#1=1 元\else
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\numexpr\year-#1\relax
\else
- 平成\ifnum\heisei=1 元年\else\kansuji\number\heisei 年\fi
- \kansuji\number\month 月
- \kansuji\number\day 日
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi 年
+}
+\def\pltx at today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx at today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx at today@year@{1988}%
\else
- \if西暦
- \number\year~年
- \number\month~月
- \number\day~日
- \else
- 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi
- \number\month~月
- \number\day~日
- \fi
+ 令和\pltx at today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西暦
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi\kansuji\number\year
+ \else\number\year\nobreak\fi 年
+ \else
+ \pltx at today@year
+ \fi
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+ \kansuji\number\month 月
+ \kansuji\number\day 日
+ \else
+ \number\month\nobreak 月
+ \number\day\nobreak 日
\fi}}
\newcommand{\prepartname}{第}
\newcommand{\postpartname}{部}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize10.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utsize11.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize11.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize11.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utsize12.clo 2019-04-06 21:06:59 UTC (rev 50810)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize12.clo 2019-04-06 21:07:49 UTC (rev 50811)
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2019 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize12.clo}
- [2018/10/25 v1.8a-u00
+ [2019/04/02 v1.8b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
More information about the tex-live-commits
mailing list