texlive[42646] Master/texmf-dist: uplatex
commits+karl at tug.org
commits+karl at tug.org
Tue Dec 6 23:25:59 CET 2016
Revision: 42646
http://tug.org/svn/texlive?view=revision&revision=42646
Author: karl
Date: 2016-12-06 23:25:59 +0100 (Tue, 06 Dec 2016)
Log Message:
-----------
uplatex
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/uplatex/base/README.md
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/plcore.dtx
trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
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/uplatex.ltx
trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
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/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/uplatex/base/README.md 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/doc/uplatex/base/README.md 2016-12-06 22:25:59 UTC (rev 42646)
@@ -17,6 +17,6 @@
## Release Date
-2016-09-08
+2016-11-29
Japanese TeX Development Community
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/plcore.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -53,6 +53,7 @@
% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
% \changes{v1.2i}{2016/09/08}{v1.2g$B$N=$@5$GF~$l$?(B\cs{null}$B$,$^$:$+$C$?$N$G(B
% $B?eJ?%b!<%I$N$H$-$@$1H/9T$9$k$3$H$K$7$?(B(Issue 23)}
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
% \fi
%
% \iffalse
@@ -59,7 +60,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2016/09/01 v1.2h pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2016/11/09 v1.2j pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -443,6 +444,9 @@
}\vss}%
\fi
{\setbox \@tempboxa \box \@kludgeins}%
+%<*trace>
+ \fl at trace {kludgeins box made void}%
+%</trace>
}
%</plcore|fltrace>
% \end{macrocode}
@@ -1291,5 +1295,113 @@
% \end{macrocode}
% \end{macro}
%
+%
+% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B}
+%
+% \begin{macro}{\e at alloc@chardef}
+% \begin{macro}{\e at alloc@top}
+% \LaTeXe\ 2015/01/01$B0J9_!"3HD%%l%8%9%?$,$"$l$PMxMQ$9$k$h$&$K$J$C$F$$$^$9(B
+% $B$N$G!"(Be-p\TeX{}$B$N3HD%%l%8%9%?$rMxMQ$G$-$k$h$&$K at _Dj$7$^$9!#(B
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/11/29}%
+%<platexrelease> {\e at alloc@chardef}{Extended Allocation (FAM256)}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\omathchar\@undefined
+ \ifx\widowpenalties\@undefined
+% \end{macrocode}
+% $B%*%j%8%J%k$N(B\TeX{}$B$N>l9g!J3HD%$J$7$N%"%9%-!<(Bp\TeX{}$B$N>l9g!K!#(B
+% \begin{macrocode}
+ \mathchardef\e at alloc@top=255
+ \let\e at alloc@chardef\chardef
+ \else
+% \end{macrocode}
+% e-\TeX{}$B3HD%$G(B$2^{15}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B
+% ^^A $B!V(BFAM256$B$J$7$N(Be-(u)p\TeX{}$B!W$O;v<B>eB8:_$7$J$$$O$:!#(B
+% ^^A $B$?$@$7!"$?$H$($P(Be-(u)p\TeX{}$B$r%Y!<%9$K$7$?(B
+% ^^A p\TeX{}-ng (Asiatic pTeX)$B$O(Be-\TeX{}$B3HD%$r;}$C$F$$$F!"(B
+% ^^A FAM256$B%Q%C%A$OE,MQ$5$l$F$$$J$$$?$a!"$3$3$K3:Ev$9$k!#(B
+% ^^A cf: https://github.com/clerkma/ptex-ng
+% ^^A $B$J$*!"(Bp\TeX{}-ng$B$O(Be-p\TeX{}$B$HF1MM$K(Bpdf\TeX{}$B3HD%$N(B
+% ^^A $B0lIt!J(Be-p\TeX{}$B$HHO0O$,0lCW$7$J$$!K$r;}$C$F$$$k$3$H!"(B
+% ^^A $B$^$?(B|\lastnodechar|$B$J$I$N(Be-p\TeX{}$BFH<+$N%W%j%_%F%#%V$r(B
+% ^^A $B;}$C$F$$$J$$$3$H$K$bCm0U!#(B
+% \begin{macrocode}
+ \mathchardef\e at alloc@top=32767
+ \let\e at alloc@chardef\mathchardef
+ \fi
+\else
+% \end{macrocode}
+% FAM256$B%Q%C%A$,E,MQ$5$l$?(Be-p\TeX{}$B$N>l9g$O!"(B$2^{16}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B
+% \begin{macrocode}
+ \ifx\enablecjktoken\@undefined % pTeX
+ \omathchardef\e at alloc@top=65535
+ \let\e at alloc@chardef\omathchardef
+ \else % upTeX
+ \chardef\e at alloc@top=65535
+ \let\e at alloc@chardef\chardef
+ \fi
+\fi
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2015/01/01}%
+%<platexrelease> {\e at alloc@chardef}{Extended Allocation (FAM256)}%
+%<platexrelease>\ifx\widowpenalties\@undefined
+%<platexrelease> \mathchardef\e at alloc@top=255
+%<platexrelease> \let\e at alloc@chardef\chardef
+%<platexrelease>\else
+%<platexrelease> \mathchardef\e at alloc@top=32767
+%<platexrelease> \let\e at alloc@chardef\mathchardef
+%<platexrelease>\fi
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {\e at alloc@chardef}{Extended Allocation (FAM256)}%
+%<platexrelease>\let\e at alloc@top\@undefined
+%<platexrelease>\let\e at alloc@chardef\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\e at mathgroup@top}
+% 2015/01/01$B0J9_$N(B\LaTeXe{}$B%+!<%M%k$O!"(BXe\TeX{}$B$H(BLua\TeX{}$B$KBP$7$F?t<0(Bfam$B$N(B
+% $B>e8B$r(B16$B$+$i(B256$B$KA}$d$7$F$$$^$9!J(B|\Umathcode| $B$GH=Dj!K!#(B
+% FAM256$B%Q%C%A$,E,MQ$5$l$?(Be-p\TeX{}$B$G$bF1MM$K>e8B$r(B16$B$+$i(B256$B$KA}$d$7$^$9!#(B
+% $B$3$l$G(B
+%\begin{verbatim}
+% ! LaTeX Error: Too many math alphabets used in version normal.
+%\end{verbatim}
+% $B$,=P$K$/$/$J$k$O$:$G$9!#(B
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/11/29}%
+%<platexrelease> {\e at mathgroup@top}{Extended Allocation (FAM256)}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\omathchar\@undefined
+ \chardef\e at mathgroup@top=16 % LaTeX2e kernel standard
+\else
+ \mathchardef\e at mathgroup@top=256 % for e-pTeX FAM256 patched
+\fi
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2015/01/01}%
+%<platexrelease> {\e at mathgroup@top}{Extended Allocation (FAM256)}%
+%<platexrelease>\chardef\e at mathgroup@top=16
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {\e at mathgroup@top}{Extended Allocation (FAM256)}%
+%<platexrelease>\let\e at mathgroup@top\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
% \Finale
\endinput
Modified: trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/source/uplatex/base/ujclasses.dtx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -63,6 +63,25 @@
% (ありがとうございます、鈴木た＠MILNさん)}
% \changes{v1.6}{2006/06/27}{フォントコマンドを修正。ありがとう、ymtさん。}
% \changes{v1.6-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
+% \changes{v1.7}{2016/11/12}{ドキュメントに反して\cs{@maketitle}が
+% 空になっていなかったのを修正}
+% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)}
+% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by
+% \cs{hb at xt@} (sync with classes.dtx v1.3a)}
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
+% \changes{v1.7}{2016/11/12}{\cs{columnsep}と\cs{columnseprule}の
+% 変更を後ろに移動(sync with classes.dtx v1.4f)}
+% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and
+% possibly force horizontal mode (sync with classes.dtx v1.4a)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
+% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for
+% latex/2343 (sync with ltsect.dtx v1.0z)}
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
+% \changes{v1.7b}{2016/11/22}{補足ドキュメントを追加}
+% \changes{v1.7b-u00}{2016/11/22}{p\LaTeX{}用に追随}
% \fi
%
% \iffalse
@@ -92,7 +111,7 @@
%<11pt&bk>\ProvidesFile{utbk11.clo}
%<12pt&bk>\ProvidesFile{utbk12.clo}
%</tate>
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
%<article|report|book> Standard upLaTeX class]
%<10pt|11pt|12pt> Standard upLaTeX file (size option)]
%<*driver>
@@ -557,7 +576,7 @@
% \begin{macro}{\Cwd}
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
-% 基準となる長さの設定をします。これらのパラメータは\file{platex.dtx}で定義
+% 基準となる長さの設定をします。これらのパラメータは\file{uplfonts.dtx}で定義
% されています。
% \begin{macrocode}
\setbox0\hbox{\char\euc"A1A1}%
@@ -1596,7 +1615,7 @@
%
% \section{ページスタイル}\label{sec:pagestyle}
% p\LaTeXe{}では、つぎの6種類のページスタイルを使用できます。
-% \pstyle{empty}は\file{latex.dtx}で定義されています。
+% \pstyle{empty}は\file{ltpage.dtx}で定義されています。
%
% \begin{tabular}{ll}
% empty & ヘッダにもフッタにも出力しない\\
@@ -1617,10 +1636,10 @@
%
% \DeleteShortVerb{\|}
% \begin{tabular}{ll}
-% |\@oddhead| & 奇数ページのヘッダを出力\\
-% |\@oddfoot| & 奇数ページのフッタを出力\\
-% |\@evenhead| & 偶数ページのヘッダを出力\\
-% |\@evenfoot| & 偶数ページのフッタを出力\\
+% \cs{@oddhead} & 奇数ページのヘッダを出力\\
+% \cs{@oddfoot} & 奇数ページのフッタを出力\\
+% \cs{@evenhead} & 偶数ページのヘッダを出力\\
+% \cs{@evenfoot} & 偶数ページのフッタを出力\\
% \end{tabular}
% \MakeShortVerb{\|}
%
@@ -1667,9 +1686,9 @@
% \changes{v1.0a}{1995/08/30}{柱の書体がノンブルに影響するバグの修正}
%
% \subsection{plainページスタイル}
-% \pstyle{jpl at in}に|\let|するために、ここで定義をします。
%
% \begin{macro}{\ps at plain}
+% \pstyle{jpl at in}に|\let|するために、ここで定義をします。
% \begin{macrocode}
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
@@ -1681,6 +1700,8 @@
% \end{macro}
%
% \subsection{jpl at inページスタイル}
+%
+% \begin{macro}{\ps at jpl@in}
% \changes{v1.0d}{1996/02/29}{\pstyle{jpl at in}の初期値を定義}
%
% \pstyle{jpl at in}スタイルは、クラスファイル内部で使用するものです。
@@ -1696,8 +1717,6 @@
% 出力されます。
%
% ここで、定義をしているのは、その初期値です。
-%
-% \begin{macro}{\ps at jpl@in}
% \begin{macrocode}
\let\ps at jpl@in\ps at plain
% \end{macrocode}
@@ -1907,10 +1926,10 @@
% \subsubsection{表題}
%
% \begin{macro}{\title}
-% \begin{macro}{\autor}
+% \begin{macro}{\author}
% \begin{macro}{\date}
% 文書のタイトル、著者、日付の情報のための、
-% これらの３つのコマンドは\file{latex.dtx}で提供されています。
+% これらの３つのコマンドは\file{ltsect.dtx}で提供されています。
% これらのコマンドは次のように定義されています。
% \begin{macrocode}
%\newcommand*{\title}[1]{\gdef\@title{#1}}
@@ -2049,11 +2068,11 @@
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
%<*tate>
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb at xt@ 2zw{\hss\@makefnmark}##1}%
%</tate>
%<*yoko>
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
+ \hb at xt@1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
%</yoko>
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
@@ -2069,11 +2088,14 @@
% ここでグループを閉じ、\Lcount{footnote}カウンタをリセットし、
% |\thanks|, |\maketitle|, |\@maketitle|を無効にし、
% いくつかの内部マクロを空にして格納領域を節約します。
+% \changes{v1.7}{2016/11/12}{ドキュメントに反して\cs{@maketitle}が
+% 空になっていなかったのを修正}
% \begin{macrocode}
\endgroup
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -2158,7 +2180,7 @@
% \begin{macro}{\subparagraphmark}
% |\...mark|コマンドを初期化します。これらのコマンドはページスタイルの
% 定義で使われます（第\ref{sec:pagestyle}節参照）。
-% これらのたいていのコマンドは\file{latex.dtx}ですでに定義されています。
+% これらのたいていのコマンドは\file{ltsect.dtx}ですでに定義されています。
% \begin{macrocode}
%<!article>\newcommand*{\chaptermark}[1]{}
%\newcommand*{\sectionmark}[1]{}
@@ -2305,13 +2327,25 @@
% \begin{macro}{\mainmatter}
% \begin{macro}{\backmatter}
% \changes{v1.1}{1997/01/15}{\cs{frontmatter}, \cs{mainmatter}, \cs{backmatter}
-% を\LaTeX\ の定義に修正}
+% を\LaTeX{}の定義に修正}
% 一冊の本は論理的に３つに分割されます。
% 表題や目次や「はじめに」あるいは権利などの前付け、
% そして本文、それから用語集や索引や奥付けなどの後付けです。
+%
+% \emph{日本語\TeX{}開発コミュニティによる補足}：
+% \LaTeX{}のclasses.dtxは、1996/05/26 (v1.3r)と1998/05/05 (v1.3y)の
+% 計2回、|\frontmatter|と|\mainmatter|の定義を修正しています。一回目は
+% これらの命令を|openany|オプションに応じて切り替え、二回目はそれを
+% 元に戻しています。アスキーによるjclasses.dtxは、1997/01/15に
+% 一回目の修正に追随しましたが、二回目の修正には追随していません。
+% コミュニティ版では、アスキーによる仕様を維持することとし、
+% |openany|オプションの場合は|\cleardoublepage|ではなく|\clearpage|が
+% 発行されます。もし|\cleardoublepage|が起きてほしい場合には、
+% 明示的に挿入してください。（参考：latex/2754）
+% \changes{v1.7b}{2016/11/22}{補足ドキュメントを追加}
% \begin{macrocode}
%<*book>
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if at openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -2383,11 +2417,19 @@
%
% articleクラスの場合は、簡単です。
%
-% 新しい段落を開始し、小さな空白を入れ、段落後のインデントをしないようにし、
-% |\secdef|で作成します。
+% 新しい段落を開始し、小さな空白を入れ、段落後のインデントを行い、
+% |\secdef|で作成します。（アスキーによる元のドキュメントには
+% 「段落後のインデントをしないようにし」と書かれていましたが、
+% 実際のコードでは段落後のインデントを行っていました。そこで
+% 日本語\TeX{}開発コミュニティは、ドキュメントをコードに合わせて
+% 「段落後のインデントを行い」へと修正しました。）
+% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and
+% possibly force horizontal mode (sync with classes.dtx v1.4a)}
% \begin{macrocode}
%<*article>
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if at noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
%</article>
@@ -2417,6 +2459,8 @@
%
% articleクラスの場合は、\Lcount{secnumdepth}が$-1$よりも大きいとき、
% 見出し番号を付けます。このカウンタが$-1$以下の場合には付けません。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
%<*article>
\def\@part[#1]#2{%
@@ -2429,7 +2473,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >\m at ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -2454,7 +2498,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -2467,11 +2511,13 @@
%
% \begin{macro}{\@spart}
% このマクロは、番号を付けないときの体裁です。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
%<*article>
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
%</article>
@@ -2482,7 +2528,7 @@
%<*report|book>
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
%</report|book>
@@ -2561,12 +2607,14 @@
% 見出し文字列も消えてしまうのを修正}
% \changes{v1.2}{2001/09/04}{\cs{chapter}の出力位置がアスタリスク形式と
% そうでないときと違うのを修正(ありがとう、鈴木＠津さん)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\def\@makechapterhead#1{\hbox{}%
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c at secnumdepth >\m at ne
\setlength\@tempdima{\linewidth}%
@@ -2597,12 +2645,14 @@
% 番号を付けない場合の形式です。
% \changes{v1.2}{2001/09/04}{\cs{chapter}の出力位置がアスタリスク形式と
% そうでないときと違うのを修正(ありがとう、鈴木＠津さん)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\def\@makeschapterhead#1{\hbox{}%
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -2614,31 +2664,37 @@
%
% \begin{macro}{\section}
% 見出しの前後に空白を付け、|\Large\bfseries|で出力をします。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\subsection}
% 見出しの前後に空白を付け、|\large\bfseries|で出力をします。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\subsubsection}
% 見出しの前後に空白を付け、|\normalsize\bfseries|で出力をします。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -2645,11 +2701,13 @@
% \begin{macro}{\paragraph}
% 見出しの前に空白を付け、|\normalsize\bfseries|で出力をします。
% 見出しの後ろで改行されません。
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -2657,10 +2715,12 @@
% 見出しの前に空白を付け、|\normalsize\bfseries|で出力をします。
% 見出しの後ろで改行されません。
% \begin{macrocode}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset at font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -2955,6 +3015,8 @@
% \changes{v1.1q}{1999/05/18}{縦組時のみに設定するようにした}
% トップレベルで使われたときに、最初と最後に半行分のスペースを開けるように、
% 変更します。この環境は、\file{ltlists.dtx}で定義されています。
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
%
% \begin{macrocode}
\renewenvironment{enumerate}
@@ -2961,7 +3023,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -3008,13 +3070,14 @@
% \changes{v1.0e}{1996/03/14}{縦組時のみに設定するようにした}
% トップレベルで使われたときに、最初と最後に半行分のスペースを開けるように、
% 変更します。この環境は、\file{ltlists.dtx}で定義されています。
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
% \begin{macrocode}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -3285,7 +3348,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
% \end{macrocode}
@@ -3587,7 +3650,7 @@
% |\numberline|マクロを再定義します。
% \begin{macrocode}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3596,6 +3659,8 @@
% 目次の各行間に|\toclineskip|を入れるように変更します。
% このマクロは\file{ltsect.dtx}で定義されています。
% \changes{v1.3}{2001/10/04}{第５引数の書体を\cs{rmfamily}から\cs{normalfont}に変更}
+% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for
+% latex/2343 (sync with ltsect.dtx v1.0z)}
% \begin{macrocode}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
@@ -3605,7 +3670,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -3646,6 +3711,11 @@
%</report|book>
%<article> \section*{\contentsname
%<!article> \chapter*{\contentsname
+% \end{macrocode}
+% |\tableofcontents|では、|\@mkboth|はheadingの中に入れてあります。
+% ほかの命令（|\listoffigures|など）については、|\@mkboth|はheadingの
+% 外に出してあります。これは\LaTeX の\file{classes.dtx}に合わせています。
+% \begin{macrocode}
\@mkboth{\contentsname}{\contentsname}%
}\@starttoc{toc}%
%<report|book> \if at restonecol\twocolumn\fi
@@ -3667,7 +3737,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
%<article> \if at compatibility
\global\@nobreaktrue
@@ -3691,7 +3761,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -3712,7 +3782,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
%</article>
@@ -3771,15 +3841,17 @@
%
% \begin{macro}{\listoffigures}
% 図の一覧を作成します。
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newcommand{\listoffigures}{%
%<*report|book>
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
+ \chapter*{\listfigurename}%
%</report|book>
-%<article> \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+%<article> \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
%<report|book> \if at restonecol\twocolumn\fi
}
@@ -3797,15 +3869,17 @@
% \begin{macro}{\listoftables}
% \changes{v1.0c}{1995/12/28}{fix the \cs{listoftable} typo.}
% 表の一覧を作成します。
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newcommand{\listoftables}{%
%<*report|book>
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
+ \chapter*{\listtablename}%
%</report|book>
-%<article> \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+%<article> \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
%<report|book> \if at restonecol\twocolumn\fi
}
@@ -3839,10 +3913,12 @@
%
% \begin{environment}{thebibliography}
% 参考文献や関連図書のリストを作成します。
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newenvironment{thebibliography}[1]
-%<article>{\section*{\refname\@mkboth{\refname}{\refname}}%
-%<report|book>{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+%<article>{\section*{\refname}\@mkboth{\refname}{\refname}%
+%<report|book>{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -3883,7 +3959,7 @@
%
% \begin{macro}{\@cite}
% The output of the |\cite| command is produced by this macro. The
-% default from \file{latex.dtx} is used.
+% default from \file{ltbibl.dtx} is used.
% \begin{macrocode}
% \renewcommand*{\@cite}[1]{[#1]}
% \end{macrocode}
@@ -3899,12 +3975,19 @@
% \begin{macrocode}
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
%<article> \twocolumn[\section*{\indexname}]%
%<report|book> \twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
+% \end{macrocode}
+% パラメータ|\columnseprule|と|\columnsep|の変更は、|\twocolumn|が
+% 実行された後でなければなりません。そうしないと、索引の前のページ
+% にも影響してしまうためです。
+% \changes{v1.7}{2016/11/12}{\cs{columnsep}と\cs{columnseprule}の
+% 変更を後ろに移動(sync with classes.dtx v1.4f)}
+% \begin{macrocode}
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
@@ -3935,11 +4018,12 @@
%
% \begin{macro}{\footnoterule}
% 本文と脚注の間に引かれる罫線です。
+% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)}
% \begin{macrocode}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
% \end{macrocode}
% \end{macro}
%
@@ -3954,14 +4038,16 @@
% このマクロにしたがって脚注が組まれます。
%
% |\@makefnmark|は脚注記号を組み立てるマクロです。
+% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by
+% \cs{hb at xt@} (sync with classes.dtx v1.3a)}
% \begin{macrocode}
%<*tate>
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 2zw{\hss\@makefnmark}#1}
%</tate>
%<*yoko>
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
%</yoko>
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplatex.dtx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -54,6 +54,7 @@
% \changes{v1.0l-u01}{2016/06/19}{パッチレベルを\file{uplvers.dtx}から取得}
% \changes{v1.0m-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
+% \changes{v1.0n-u01}{2016/09/14}{\LaTeX{}のバナーの保存しかたを改良}
% \fi
%
% \iffalse
@@ -60,7 +61,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{uplatex.dtx}[2016/08/26 v1.0m-u01 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2016/09/14 v1.0n-u01 upLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -257,11 +258,53 @@
\let\dump\relax
% \end{macrocode}
%
-% \file{latex.ltx}を読み込み、起動時のバナーを保存します。
+% \file{latex.ltx}を読み込み、起動時のバナーを保存します。\TeX\ Liveの標準的
+% インストールでは、この中でBabel由来のハイフネーション・パターン
+% \file{hyphen.cfg}が読み込まれ、そのバージョンも含めて保存されるはずです。
+%
+%\iffalse
+% 2016/05/07の実装では、\file{platex.ltx}のなかで
+%\begin{verbatim}
+% \edef\platexBANNER{\the\everyjob}
+%\end{verbatim}
+% としてバナーを保存し、この内容が
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{Babel version}
+%\end{verbatim}
+% という4つのトークンから成ると仮定して、\file{plcore.ltx}のなかで
+%\begin{verbatim}
+% \def\parse@@BANNER#1#2#3#4{#2}
+%\end{verbatim}
+% のようにパースしていました。ところが、この「4つのトークンから成る」と
+% いう仮定はBabel由来の\file{hyphen.cfg}を使用した場合のみ成り立ち、
+% それ以外の特別な\file{hyphen.cfg}や\file{hyphen.ltx}を使用した場合に
+% エラーになってしまいます。
+% そこで、新たに2016/09/14の実装では、\file{platex.ltx}のなかで
+%\begin{verbatim}
+% \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}
+%\end{verbatim}
+% としてダミーを追加します（|\relax|はただの区切りトークンの役割）。
+% こうすると、|\platexBANNER|の内容は、Babelの\file{hyphen.cfg}のとき
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{Babel version}\typeout{}\relax
+%\end{verbatim}
+% となり、それ以外のとき
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{}\relax
+%\end{verbatim}
+% となるはずです。このように、少なくとも|\typeout|が2回含まれています
+% ので、\file{plcore.ltx}のなかで
+%\begin{verbatim}
+% \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
+%\end{verbatim}
+% とパースすることができるようになります。
+%\fi
+%
% \changes{v1.0g-u00}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存}
+% \changes{v1.0n-u01}{2016/09/14}{\LaTeX{}のバナーの保存しかたを改良}
% \begin{macrocode}
\input latex.ltx
-\edef\platexBANNER{\the\everyjob}% save LaTeX banner
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
% \end{macrocode}
%
% \file{uplcore.ltx}を読み込み、このup\LaTeX{}のバージョンを表示します。
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -312,7 +312,7 @@
% このときの具体的な判断手順については、エンコード選択コマンドや
% ファミリ選択コマンドなどの定義を参照してください。
%
-% \begin{macro}{\inlist}
+% \begin{macro}{\inlist@}
% 次のコマンドは、エンコードやファミリのリスト内に第二引数で指定された文字列
% があるかどうかを調べるマクロです。
% \begin{macrocode}
@@ -659,7 +659,7 @@
% \end{macro}
%
% \begin{macro}{\DeclareKanjiFamily}
-% 欧文ファミリを宣言するためのコマンドです。
+% 和文ファミリを宣言するためのコマンドです。
% \begin{macrocode}
\def\DeclareKanjiFamily#1#2#3{%
\@ifundefined{T@#1}%
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -58,12 +58,13 @@
% \changes{v1.0y-u01}{2016/06/29}{\file{uplatex.cfg}の読み込みを追加}
% \changes{v1.0z-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
+% \changes{v1.1-u01}{2016/09/14}{起動時のバナーを取得するコードを改良}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{uplvers.dtx}[2016/08/26 v1.0z-u01 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2016/09/14 v1.1-u01 upLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{uplvers.dtx}
@@ -127,7 +128,7 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2016/09/08u01}
+ {2016/11/29u01}
%</plcore|platexrelease>
%<*plcore>
\def\ppatch at level{0}
@@ -198,9 +199,15 @@
%
% 起動時に表示される文字列です。
% \LaTeX{}にパッチがあてられている場合は、それも表示します。
+%
+%\iffalse
+% この実装については\file{uplatex.dtx}のコメントを参照。(2016/09/14)
+%\fi
+%
% \changes{v1.0v-u00}{2016/05/07}{起動時の文字列を最新の\LaTeX{}に合わせた。}
% \changes{v1.0w-u00}{2016/05/12}{起動時の文字列に入れる\LaTeX{}のバージョンを
% 元の\LaTeX{}のバナーから引き継ぐように改良}
+% \changes{v1.1-u01}{2016/09/14}{起動時のバナーを取得するコードを改良}
% \begin{macrocode}
\ifx\patch at level\@undefined % fallback if undefined in LaTeX
\def\patch at level{0}\fi
@@ -207,17 +214,16 @@
\ifx\ppatch at level\@undefined % fallback if undefined in upLaTeX
\def\ppatch at level{0}\fi
\begingroup
- \def\parse at BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#2}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
\edef\platexTMP{%
\ifnum\ppatch at level=0
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>\space
- (based on \parse at BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\else
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>+\ppatch at level\space
- (based on \parse at BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\fi
}
\expandafter
@@ -225,16 +231,22 @@
% \end{macrocode}
%
% p\LaTeX{}やup\LaTeX{}は、独自のハイフネーション・パターンを定義していません。
-% 代わりに、\LaTeX{}が読み込んでいるBabelパッケージのものが適用されます。
-% 起動時の文字列にも\file{hyphen.cfg}のバージョンを反映します。
+% \TeX\ Liveの標準的インストールでは、代わりに\LaTeX{}が読み込んでいる
+% Babelパッケージのものが適用されるはずですから、起動時の文字列にも
+% \file{hyphen.cfg}のバージョンを反映します（Babelパッケージの
+% \file{hyphen.cfg}でない場合は、何も表示されず空行になるはずです）。
+%
+%\iffalse
+% この実装については\file{uplatex.dtx}のコメントを参照。(2016/09/14)
+%\fi
+%
% \changes{v1.0w-u00}{2016/05/12}{起動時の文字列に入れるBabelのバージョンを
% 元の\LaTeX{}のバナーから取得するコードを\file{uplatex.ini}から取り入れた}
% \begin{macrocode}
\begingroup
- \def\parse at BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#4}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
\edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\parse at BANNER{\platexBANNER}}%
+ \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
}
\everyjob=\expandafter{\platexTMP}%
\edef\platexTMP{%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujarticle.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujarticle}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -290,7 +290,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
+ \hb at xt@1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -305,6 +305,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -370,7 +371,9 @@
\thesubsubsection.\@arabic\c at paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c at subparagraph}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if at noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -383,7 +386,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >\m at ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -392,29 +395,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -455,7 +458,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -482,8 +485,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -559,7 +561,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -613,7 +615,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -622,7 +624,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -651,7 +653,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if at compatibility
\global\@nobreaktrue
@@ -668,7 +670,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l at subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
@@ -676,14 +678,14 @@
\newcommand*{\l at paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
\newcommand*{\l at subparagraph} {\@dottedtocline{5}{10em}{5em}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l at figure}{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l at table\l at figure
@@ -691,7 +693,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -711,11 +713,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -724,10 +726,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk10.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk10.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk11.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk11.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbk12.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk12.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujbook.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujbook}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -316,7 +316,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
+ \hb at xt@1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -331,6 +331,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -379,7 +380,7 @@
\theparagraph.\@arabic\c at subparagraph}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if at openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -404,7 +405,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -413,7 +414,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -444,7 +445,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c at secnumdepth >\m at ne
\setlength\@tempdima{\linewidth}%
@@ -464,7 +465,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -471,23 +472,23 @@
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -530,7 +531,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -557,8 +558,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -636,7 +636,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -692,7 +692,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -701,7 +701,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -733,7 +733,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -748,7 +748,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -760,8 +760,8 @@
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if at restonecol\twocolumn\fi
}
@@ -769,8 +769,8 @@
\newcommand{\listoftables}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if at restonecol\twocolumn\fi
}
@@ -779,7 +779,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -799,11 +799,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -812,11 +812,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujreport.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujreport}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -304,7 +304,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
+ \hb at xt@1.8em{\hss$\m at th^{\@thefnmark}$}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -319,6 +319,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -405,7 +406,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -414,7 +415,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -443,7 +444,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c at secnumdepth >\m at ne
\setlength\@tempdima{\linewidth}%
@@ -461,7 +462,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -468,23 +469,23 @@
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -527,7 +528,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -554,8 +555,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -633,7 +633,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -689,7 +689,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -698,7 +698,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -730,7 +730,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -745,7 +745,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -757,8 +757,8 @@
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if at restonecol\twocolumn\fi
}
@@ -766,8 +766,8 @@
\newcommand{\listoftables}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if at restonecol\twocolumn\fi
}
@@ -776,7 +776,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -796,11 +796,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -809,11 +809,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize10.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize10.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize11.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize11.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/ujsize12.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize12.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/uplatex.ltx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -17,7 +17,7 @@
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
-\edef\platexBANNER{\the\everyjob}% save LaTeX banner
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\typeout{**************************^^J%
*^^J%
* making upLaTeX format^^J%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx 2016-12-06 22:25:59 UTC (rev 42646)
@@ -19,7 +19,7 @@
%% File: uplvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/09/08u01}
+ {2016/11/29u01}
\def\ppatch at level{0}
\def\plIncludeInRelease#1{\kernel at ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -1005,6 +1005,28 @@
\relax
\ifmmode\@@underline{#1}%
\else \leavevmode\null$\@@underline{\hbox{#1}}\m at th$\null\relax\fi}
+\ifx\omathchar\@undefined
+ \ifx\widowpenalties\@undefined
+ \mathchardef\e at alloc@top=255
+ \let\e at alloc@chardef\chardef
+ \else
+ \mathchardef\e at alloc@top=32767
+ \let\e at alloc@chardef\mathchardef
+ \fi
+\else
+ \ifx\enablecjktoken\@undefined % pTeX
+ \omathchardef\e at alloc@top=65535
+ \let\e at alloc@chardef\omathchardef
+ \else % upTeX
+ \chardef\e at alloc@top=65535
+ \let\e at alloc@chardef\chardef
+ \fi
+\fi
+\ifx\omathchar\@undefined
+ \chardef\e at mathgroup@top=16 % LaTeX2e kernel standard
+\else
+ \mathchardef\e at mathgroup@top=256 % for e-pTeX FAM256 patched
+\fi
%% File: uplvers.dtx
\def\documentstyle{%
\@latex at error{upLaTeX does NOT support LaTeX 2.09 compatibility mode}\@ehc
@@ -1014,26 +1036,24 @@
\ifx\ppatch at level\@undefined % fallback if undefined in upLaTeX
\def\ppatch at level{0}\fi
\begingroup
- \def\parse at BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#2}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
\edef\platexTMP{%
\ifnum\ppatch at level=0
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>\space
- (based on \parse at BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\else
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>+\ppatch at level\space
- (based on \parse at BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\fi
}
\expandafter
\endgroup \platexTMP
\begingroup
- \def\parse at BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#4}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
\edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\parse at BANNER{\platexBANNER}}%
+ \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
}
\everyjob=\expandafter{\platexTMP}%
\edef\platexTMP{%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utarticle.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utarticle}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -294,7 +294,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb at xt@ 2zw{\hss\@makefnmark}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -309,6 +309,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -374,7 +375,9 @@
\thesubsubsection{}・\rensuji{\@arabic\c at paragraph}}
\renewcommand{\thesubparagraph}{%
\theparagraph{}・\rensuji{\@arabic\c at subparagraph}}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if at noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -387,7 +390,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >\m at ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -396,29 +399,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -459,7 +462,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -486,8 +489,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -563,7 +565,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -617,7 +619,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -626,7 +628,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -655,7 +657,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if at compatibility
\global\@nobreaktrue
@@ -672,7 +674,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l at subsection} {\@dottedtocline{2}{1zw}{4zw}}
@@ -680,14 +682,14 @@
\newcommand*{\l at paragraph} {\@dottedtocline{4}{3zw}{8zw}}
\newcommand*{\l at subparagraph} {\@dottedtocline{5}{4zw}{9zw}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l at figure}{\@dottedtocline{1}{1zw}{4zw}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l at table\l at figure
@@ -695,7 +697,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -715,11 +717,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -728,10 +730,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 2zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk10.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk10.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk11.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk11.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbk12.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk12.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utbook.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utbook}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -320,7 +320,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb at xt@ 2zw{\hss\@makefnmark}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -335,6 +335,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -383,7 +384,7 @@
\theparagraph{}・\rensuji{\@arabic\c at subparagraph}}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if at openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -408,7 +409,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -417,7 +418,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -448,7 +449,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c at secnumdepth >\m at ne
\setlength\@tempdima{\linewidth}%
@@ -468,7 +469,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -475,23 +476,23 @@
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -534,7 +535,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -561,8 +562,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -640,7 +640,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -696,7 +696,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -705,7 +705,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -737,7 +737,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -752,7 +752,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -764,8 +764,8 @@
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if at restonecol\twocolumn\fi
}
@@ -773,8 +773,8 @@
\newcommand{\listoftables}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if at restonecol\twocolumn\fi
}
@@ -783,7 +783,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -803,11 +803,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -816,11 +816,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 2zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utreport.cls 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utreport}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if at landscape \@landscapefalse
@@ -308,7 +308,7 @@
\def\@makefnmark{\hbox{\ifydir $\m at th^{\@thefnmark}$
\else\hbox{\yoko$\m at th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb at xt@ 2zw{\hss\@makefnmark}##1}%
\if at twocolumn
\ifnum \col at number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -323,6 +323,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p at thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -409,7 +410,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -418,7 +419,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset at font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -447,7 +448,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c at secnumdepth >\m at ne
\setlength\@tempdima{\linewidth}%
@@ -465,7 +466,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset at font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -472,23 +473,23 @@
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset at font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -531,7 +532,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -558,8 +559,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -637,7 +637,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -693,7 +693,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c at tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -702,7 +702,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m at th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -734,7 +734,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb at xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -749,7 +749,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb at xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -761,8 +761,8 @@
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if at restonecol\twocolumn\fi
}
@@ -770,8 +770,8 @@
\newcommand{\listoftables}{%
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if at restonecol\twocolumn\fi
}
@@ -780,7 +780,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -800,11 +800,11 @@
\let\@openbib at code\@empty
\newenvironment{theindex}
{\if at twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl at in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if at restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -813,11 +813,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb at xt@ 2zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
Modified: trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize10.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize10.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize11.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize11.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-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 2016-12-06 22:19:27 UTC (rev 42645)
+++ trunk/Master/texmf-dist/tex/uplatex/base/utsize12.clo 2016-12-06 22:25:59 UTC (rev 42646)
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize12.clo}
- [2011/05/07 v1.6-u00
+ [2016/11/22 v1.7b-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
More information about the tex-live-commits
mailing list