summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujarticle.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbook.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujreport.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ukinsoku.tex6
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utarticle.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbook.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utreport.cls49
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize12.clo4
19 files changed, 204 insertions, 144 deletions
diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
index 9a663f4f5da..2b148c04038 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
index 7e1cb4a43b9..a0183517a84 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
index c0cf0306081..0c1e82bf19b 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
index d4b2c8bece4..bc657b2eedc 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
index 54ccc887931..3410991dea6 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
index c2241730e12..30535b6b7cd 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
index a6acc4358ff..d17ffb46f3a 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
index 31fcc8e52b0..e4b3afdf409 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
index 9766dd3cd95..2e42c5263a6 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index d16eac1743c..d09870106c3 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -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
%%
%% 行頭、行末禁則パラメータ
%%
diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
index ff677b9e080..b438886efc4 100644
--- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
index 621a9583d19..0c6fed6d330 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
index 25da7215a0b..4c8998f2627 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
index 265e59c7dc3..12c26ed82f6 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls
index 85a3dc8c961..ca20440b629 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls
index 2f352e20d61..dc3d8e0ee73 100644
--- a/Master/texmf-dist/tex/uplatex/base/utreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls
@@ -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@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@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@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ 昭和\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ 平成\pltx@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@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@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}{部}
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
index 67eca16e0fd..4cd15d2660e 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
index 8349467d5a6..1d18b441113 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
@@ -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}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
index 54ac09f4b55..cde180d92a3 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
@@ -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}%