diff options
29 files changed, 159 insertions, 139 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index 5d3a09bdd4d..72ea8417e60 100644 --- a/Master/texmf-dist/doc/uplatex/base/README.md +++ b/Master/texmf-dist/doc/uplatex/base/README.md @@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-07-28 +2018-12-01 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt b/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt deleted file mode 100644 index 0df0384777e..00000000000 --- a/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt +++ /dev/null @@ -1,88 +0,0 @@ -upLaTeX standard format files and class files - - -#### Contents -## ins files - uplfmt.ins: "uptex uplfmt.ins" generates - uplatex.ltx, uplcore.ltx, upldefs.ltx, - jy2{mc,gt}.fd, jt2{mc,gt}.fd, uptrace.sty, ukinsoku.tex - from uplatex.dtx, uplvers.dtx, uplfonts.dtx, plcore.dtx, ukinsoku.dtx - uplcls.ins: "uptex uplcls.ins" generates - ujarticle.cls, ujreport.cls, ujbook.cls, ujsize{10,11,12}.clo, ujbk{10,11,12}.clo, - utarticle.cls, utreport.cls, utbook.cls, utsize{10,11,12}.clo, utbk{10,11,12}.clo - from ujclasses.dtx -## dtx files - uplatex.dtx, uplvers.dtx, plcore.dtx: for format files - plcore.dtx is as same as that of original pLaTeX2e <2006/11/10>. - uplfonts.dtx: for font files. - ukinsoku.dtx: for kinsoku file. - ujclasses.dtx: for class files. - Document (*.dvi) ganeration has not been checked yet. -## fd files, cls files, sty files, tex files - these are generated by uptex and above sources. - - -#### Copyright -The files in this directory are -based on "texmf library for Japanese TeX (pTeX)" -by ASCII Corporation (currently ASCII MEDIA WORKS Inc.) -and modified for upTeX/upLaTeX. -These are available under the following license agreement. - -=============================================================================== - -Copyright (C) 1987, 1995 ASCII Corporation. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the author may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=============================================================================== - - -#### ChangeLog - -uptex-1.20 [2014/12/29] TTK - * re-package for upTeX/upLaTeX Ver.1.20 distribution. - -uptex-1.10 [2012/04/29] TTK - * Update config/uplatex.ini to Tono-san's style. - Ref. http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/31691.html - -uptex-1.00 [2012/01/15] TTK - * re-package for upTeX/upLaTeX Ver.1.00 distribution. - -v20110507a [2011/05/07] TTK - * re-package for upTeX/upLaTeX based on uptex-0.30 distribution - and ptex-texmf-2.5.tar.gz . - * reset version number for upTeX/upLaTeX. - - uplvers.dtx [2011/05/07 v1.0q_u00], \pfmtversion{2011/05/07u00} - - uplpatch.ltx \pfmtversion{2011/05/07u00} - - ujclasses.dtx [2011/05/07 v1.6_u00] - - uplatex.dtx [2011/05/07 v1.0c_u00] - - uplfonts.dtx [2011/05/07 v1.5_u00] - - ukinsoku.dtx [2011/05/07 v1.0_u00] - * rename plpatch.ltx to uplpatch.ltx . - * rename pldefs.cfg to updefs.cfg . - * add ujbk{10,11,12}.clo . - * converte files to UTF-8 encoding. diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf Binary files differindex 030b6c0bb1a..774395ef1db 100644 --- a/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf +++ b/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf Binary files differindex c68ae9f3204..161819c7171 100644 --- a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf +++ b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf Binary files differindex 6783c9aa79a..2254b1e7bd8 100644 --- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf +++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf 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{} diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 3e8c1c93465..9a663f4f5da 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujarticle} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -666,12 +666,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \section*{\contentsname diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index d947a0cbdeb..7e1cb4a43b9 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk10.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo index 555f95c379f..c0cf0306081 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk11.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo index 0e7b939e941..d4b2c8bece4 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk12.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls index afdef1ee7c0..54ccc887931 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujbook} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -759,12 +759,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \if@twocolumn\@restonecoltrue\onecolumn diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 431e93ab379..c2241730e12 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujreport} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -755,12 +755,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \if@twocolumn\@restonecoltrue\onecolumn diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index fefdab296e6..a6acc4358ff 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize10.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo index 6a0f275e8c9..31fcc8e52b0 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize11.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo index 4598e45e44b..9766dd3cd95 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize12.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index 271113c8991..ff677b9e080 100644 --- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utarticle} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -670,12 +670,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \section*{\contentsname diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index 8f95d198f24..621a9583d19 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk10.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo index a1d0f66e827..25da7215a0b 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk11.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo index d39b53934fe..265e59c7dc3 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk12.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls index 9d7db7d76e0..85a3dc8c961 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utbook} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -763,12 +763,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \if@twocolumn\@restonecoltrue\onecolumn diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index 54ea11fe161..2f352e20d61 100644 --- a/Master/texmf-dist/tex/uplatex/base/utreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utreport} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -759,12 +759,14 @@ \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}% \par}% \fi} +\providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}}}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \protected@file@percent}}% } \newcommand{\tableofcontents}{% \if@twocolumn\@restonecoltrue\onecolumn diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index 28623017784..67eca16e0fd 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize10.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo index 5e2fdf43ecf..8349467d5a6 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize11.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo index e2aabd9669e..54ac09f4b55 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize12.clo} - [2018/07/03 v1.8-u00 + [2018/10/25 v1.8a-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index e13d15d99c5..927a1aee700 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1459,7 +1459,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'tikz-cd' => '&POSTtikz_cd', 'tipa-de' => '&POST_rmsymlink', 'tudscr' => '&POSTtudscr', - 'uplatex' => '&POSTplatex', + 'uplatex' => '&POST_preserve_man', 'velthuis' => '&POSTvelthuis', 'xecyr' => '&POSTxecyr', 'xetex-pstricks' => '&POSTxetexpstricks', |