uplatex (1dec18)

git-svn-id: svn://tug.org/texlive/trunk@49301 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 115 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile
index c59f68c57e5..92d1388fa4f 100644
--- a/Master/texmf-dist/source/uplatex/base/Makefile
+++ b/Master/texmf-dist/source/uplatex/base/Makefile
@@ -95,7 +95,7 @@ install:
 	cp ./LICENSE ${TEXMF}/doc/uplatex/base/
 	cp ./README.md ${TEXMF}/doc/uplatex/base/
 	cp ./*.pdf ${TEXMF}/doc/uplatex/base/
-	cp ./*.txt ${TEXMF}/doc/uplatex/base/
+	#cp ./*.txt ${TEXMF}/doc/uplatex/base/
 	mkdir -p ${TEXMF}/source/uplatex/base
 	cp ./Makefile ${TEXMF}/source/uplatex/base/
 	cp ./*.dtx ${TEXMF}/source/uplatex/base/
diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
index ccf768c6a88..6b6d0ef24fd 100644
--- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -107,6 +107,9 @@
 % \changes{v1.7h-u00}{2018/02/04}{p\LaTeX{}用に追随}
 % \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更}
 % \changes{v1.8-u00}{2018/07/03}{p\LaTeX{}用に追随}
+% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
+%    (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8a-u00}{2018/10/25}{p\LaTeX{}用に追随}
 % \fi
 %
 % \iffalse
@@ -136,7 +139,7 @@
 %<11pt&bk>\ProvidesFile{utbk11.clo}
 %<12pt&bk>\ProvidesFile{utbk12.clo}
 %</tate>
-  [2018/07/03 v1.8-u00
+  [2018/10/25 v1.8a-u00
 %<article|report|book> Standard upLaTeX class]
 %<10pt|11pt|12pt>  Standard upLaTeX file (size option)]
 %<*driver>
@@ -3896,7 +3899,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@tocmarg}
+% \begin{macro}{\@tocrmarg}
 % 複数行にわたる場合の右マージンです。
 %    \begin{macrocode}
 \newcommand{\@tocrmarg}{2.55em}
@@ -3975,14 +3978,18 @@
 % ^^A このコマンドによる影響はありません。
 %
 % このマクロは\file{ltsect.dtx}で定義されています。
+% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
+%    (sync with ltsect.dtx 2018/09/26 v1.1c)}
 %    \begin{macrocode}
+\providecommand*\protected@file@percent{}
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%<tate>\@temptokena{\rensuji{\thepage}}}%
-%<yoko>\@temptokena{\thepage}}%
+%<tate>     \@temptokena{\rensuji{\thepage}}}%
+%<yoko>     \@temptokena{\thepage}}%
     {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+        \protected@file@percent}}%
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 5db30c35ce6..13b34bec50b 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
@@ -81,9 +81,15 @@
 %    \file{plcore.ltx}を読み込むようにした（最近の\pLaTeX{}が前提）}
 % \changes{v1.0u-u02}{2018/02/18}{\pLaTeX{}の変更に追随。
 %     (based on platex.dtx 2018/02/18 v1.0u)}
+% \changes{v1.0v-u02}{2018/04/06}{最新のsource2eへの追随
+%     (based on platex.dtx 2018/04/06 v1.0v)}
 % \changes{v1.0w-u02}{2018/04/08}{安全のためフォーマット作成時の
 %    バナー表示をやめた
 %     (based on platex.dtx 2018/04/08 v1.0w)}
+% \changes{v1.0x-u02}{2018/09/03}{ドキュメントを更新
+%     (based on platex.dtx 2018/09/03 v1.0x)}
+% \changes{v1.0y-u02}{2018/09/22}{最終更新日を\file{upldoc.pdf}に表示
+%     (based on platex.dtx 2018/09/22 v1.0y)}
 %\else
 % \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one
 %     (based on platex.dtx 1997/01/29 v1.0c)}
@@ -113,9 +119,15 @@
 %    \file{uplcore.ltx} (recent version of \pLaTeX\ is assumed)}
 % \changes{v1.0u-u02}{2018/02/18}{Sync with \pLaTeX.
 %     (based on platex.dtx 2018/02/18 v1.0u)}
+% \changes{v1.0v-u02}{2018/04/06}{Sync with the latest \file{source2e.tex}
+%     (based on platex.dtx 2018/04/06 v1.0v)}
 % \changes{v1.0w-u02}{2018/04/08}{Stop showing banner during
 %    format generation for safety
 %     (based on platex.dtx 2018/04/08 v1.0w)}
+% \changes{v1.0x-u02}{2018/09/03}{Update document.
+%     (based on platex.dtx 2018/09/03 v1.0x)}
+% \changes{v1.0y-u02}{2018/09/22}{Show last update info on \file{upldoc.pdf}
+%     (based on platex.dtx 2018/09/22 v1.0y)}
 %\fi
 % \fi
 %
@@ -123,7 +135,7 @@
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{uplatex.dtx}[2018/04/08 v1.0w-u02 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2018/09/22 v1.0y-u02 upLaTeX document file]
 % \iffalse
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -188,25 +200,29 @@
 % \changes{v1.0k-u01}{2016/06/06}{\upLaTeX{}用にドキュメントを全体的に改訂}
 % \changes{v1.0q-u01}{2017/11/29}{英語版ドキュメントを追加
 %     (based on platex.dtx 2017/11/29 v1.0q)}
+% \changes{v1.0x-u02}{2018/09/03}{ドキュメントを更新
+%     (based on platex.dtx 2018/09/03 v1.0x)}
 %\else
 % \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one
 %     (based on platex.dtx 1997/01/29 v1.0c)}
 % \changes{v1.0k-u01}{2016/06/06}{Update documents for \upLaTeX.}
 % \changes{v1.0q-u01}{2017/11/29}{New English documentation added!
 %     (based on platex.dtx 2017/11/29 v1.0q)}
+% \changes{v1.0x-u02}{2018/09/03}{Update document.
+%     (based on platex.dtx 2018/09/03 v1.0x)}
 %\fi
-% \begin{chuui}
 %\ifJAPANESE
+% \begin{chuui}
 % この文書は、「コミュニティ版\pLaTeXe{}」をベースに\upTeX{}向けの調整を
 % 加えた、「コミュニティ版\upLaTeXe{}」の付属文書です。
+% \end{chuui}
 %\else
-% This document provides a brief description of \upLaTeXe, the Japanese
-% extended version of \LaTeXe. This version is based on
+% \begin{chuui}[]
+% This document provides a brief description of \upLaTeXe, the Unicode
+% version of Japanese \pLaTeXe. This version is based on
 % `\pLaTeXe\ Community Edition.'
-% It is now maintained by Japanese \TeX\ Development
-% Community\footnote{\texttt{https://texjp.org}}.
-%\fi
 % \end{chuui}
+%\fi
 %
 %\ifJAPANESE
 % アスキー\pTeX{}は、高品質の日本語組版ソフトウェアとしてデファクト
@@ -925,7 +941,8 @@ all others indicate the places where it is used.}
 \makeatletter
 \def\changes@#1#2#3{%
   \let\protect\@unexpandable@protect
-  \edef\@tempa{\noexpand\glossary{#2\space\currentfile\space#1\levelchar
+  \edef\@tempa{\noexpand\glossary{#2\space
+               \currentfile\space#1\levelchar
                \ifx\saved@macroname\@empty
                   \space\actualchar\generalname
                \else
@@ -937,6 +954,14 @@ all others indicate the places where it is used.}
                \fi
                :\levelchar #3}}%
   \@tempa\endgroup\@esphack}
+\renewcommand*\MacroFont{\fontencoding\encodingdefault
+                   \fontfamily\ttdefault
+                   \fontseries\mddefault
+                   \fontshape\updefault
+                   \small
+                   \hfuzz 6pt\relax}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.8em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{3.4em}}
 \makeatother
 \RecordChanges
 \CodelineIndex
@@ -945,24 +970,27 @@ all others indicate the places where it is used.}
 \settowidth\MacroIndent{\ttfamily\scriptsize 000\ }
 %    \end{macrocode}
 %\ifJAPANESE
-% ここからが本文ページとなります。
+% この文書のタイトル・著者・日付を設定します。
 % \changes{v1.0h-u00}{2016/05/08}{ドキュメントから\file{uplpatch.ltx}を除外
 %     (based on platex.dtx 2016/05/08 v1.0h)}
 % \changes{v1.0l-u01}{2016/06/19}{パッチレベルを\file{uplvers.dtx}から取得
 %     (based on platex.dtx 2016/06/19 v1.0l)}
+% \changes{v1.0y-u02}{2018/09/22}{最終更新日を\file{upldoc.pdf}に表示
+%     (based on platex.dtx 2018/09/22 v1.0y)}
 %\else
-% Here starts the document body.
+% Set the title, authors and the date for this document.
 % \changes{v1.0h-u00}{2016/05/08}{Exclude \file{uplpatch.ltx} from the document
 %     (based on platex.dtx 2016/05/08 v1.0h)}
 % \changes{v1.0l-u01}{2016/06/19}{Get the patch level from \file{uplvers.dtx}
 %     (based on platex.dtx 2016/06/19 v1.0l)}
+% \changes{v1.0y-u02}{2018/09/22}{Show last update info on \file{upldoc.pdf}
+%     (based on platex.dtx 2018/09/22 v1.0y)}
 %\fi
 %    \begin{macrocode}
-\begin{document}
  \title{The \upLaTeXe\ Sources}
  \author{Ken Nakano \& Japanese \TeX\ Development Community \& TTK}
 
-% Get the date and patch level from uplvers.dtx
+% Get the (temporary) date and up-patch level from uplvers.dtx
 \makeatletter
 \let\patchdate=\@empty
 \begingroup
@@ -976,8 +1004,35 @@ all others indicate the places where it is used.}
 \ifx\patchdate\Xpatch\else
   \edef\@date{\@date\space version \patchdate}
 \fi
-\makeatother
 
+% Obtain the last update info, as upLaTeX does not change format date
+% -> if successful, reconstruct the date completely
+\def\lastupd@te{0000/00/00}
+\begingroup
+   \def\ProvidesFile#1[#2 #3]{%
+      \def\@tempd@te{#2}\endinput
+      \@ifl@t@r{\@tempd@te}{\lastupd@te}{%
+         \global\let\lastupd@te\@tempd@te
+      }{}}
+   \let\ProvidesClass\ProvidesFile
+   \let\ProvidesPackage\ProvidesFile
+   \input{uplvers.dtx}
+   \input{uplfonts.dtx}
+   \input{ukinsoku.dtx}
+   \input{ujclasses.dtx}
+\endgroup
+\@ifl@t@r{\lastupd@te}{0000/00/00}{%
+  \date{Version \patchdate\break (last updated: \lastupd@te)}%
+}{}
+\makeatother
+%    \end{macrocode}
+%\ifJAPANESE
+% ここからが本文ページとなります。
+%\else
+% Here starts the document body.
+%\fi
+%    \begin{macrocode}
+\begin{document}
 \pagenumbering{roman}
 \maketitle
 \renewcommand\maketitle{}
diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
index dce34a104c2..1a988137bbd 100644
--- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
@@ -14,6 +14,23 @@
 %
 % \fi
 %
+% \iffalse
+%<*driver>
+\ifx\JAPANESEtrue\undefined
+  \expandafter\newif\csname ifJAPANESE\endcsname
+  \JAPANESEtrue
+\fi
+\def\eTeX{$\varepsilon$-\TeX}
+\def\pTeX{p\kern-.15em\TeX}
+\def\epTeX{$\varepsilon$-\pTeX}
+\def\pLaTeX{p\kern-.05em\LaTeX}
+\def\pLaTeXe{p\kern-.05em\LaTeXe}
+\def\upTeX{u\pTeX}
+\def\eupTeX{$\varepsilon$-\upTeX}
+\def\upLaTeX{u\pLaTeX}
+\def\upLaTeXe{u\pLaTeXe}
+%</driver>
+% \fi
 %
 % \setcounter{StandardModuleDepth}{1}
 % \StopEventually{}
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 09992215d86..cfe35608c41 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -14,6 +14,23 @@
 %
 % \fi
 %
+% \iffalse
+%<*driver>
+\ifx\JAPANESEtrue\undefined
+  \expandafter\newif\csname ifJAPANESE\endcsname
+  \JAPANESEtrue
+\fi
+\def\eTeX{$\varepsilon$-\TeX}
+\def\pTeX{p\kern-.15em\TeX}
+\def\epTeX{$\varepsilon$-\pTeX}
+\def\pLaTeX{p\kern-.05em\LaTeX}
+\def\pLaTeXe{p\kern-.05em\LaTeXe}
+\def\upTeX{u\pTeX}
+\def\eupTeX{$\varepsilon$-\upTeX}
+\def\upLaTeX{u\pLaTeX}
+\def\upLaTeXe{u\pLaTeXe}
+%</driver>
+% \fi
 %
 % \setcounter{StandardModuleDepth}{1}
 % \StopEventually{}