diff options
Diffstat (limited to 'Master/texmf-dist')
23 files changed, 325 insertions, 185 deletions
diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md index e051a09a40b..f860393a453 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/README.md +++ b/Master/texmf-dist/doc/platex/jsclasses/README.md @@ -37,7 +37,7 @@ distributed separately. ## Release Date -2020-02-02 +2020-10-05 Haruhiko Okumura, Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf Binary files differindex 63ff3c6e698..6288f723c20 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf Binary files differindex edb8926c78a..6975d75515a 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf Binary files differindex cf1162f27ea..a2273084a57 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf Binary files differindex 1f7e21ce5c4..78b40bb4336 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf Binary files differindex b5da6698d5f..b8014b3c660 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf diff --git a/Master/texmf-dist/source/platex/jsclasses/Makefile b/Master/texmf-dist/source/platex/jsclasses/Makefile index b7af18707de..3e91b82d584 100644 --- a/Master/texmf-dist/source/platex/jsclasses/Makefile +++ b/Master/texmf-dist/source/platex/jsclasses/Makefile @@ -3,14 +3,15 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) KANJI = -kanji=utf8 -FONTMAP = -f ipaex.map -f ptex-ipaex.map +FONTMAP = -f haranoaji.map -f ptex-haranoaji.map TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) default: $(STRIPTARGET) $(DVITARGET) strip: $(STRIPTARGET) all: $(STRIPTARGET) $(PDFTARGET) -JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls +JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls \ + minijs.sty # for generating files, we use pdflatex incidentally. # otherwise, ptexenc might convert U+2212 -> U+FF0D in okumacro.sty diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx index 8e6642b3299..941b08c4f37 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx +++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx @@ -9,7 +9,7 @@ % pLaTeX2ε新ドキュメントクラス（日本語 TeX 開発コミュニティ版） % 原作者：奥村晴彦 <okumura@okumuralab.org> % -% Copyright 1993-2019 +% Copyright 1993-2020 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -28,10 +28,11 @@ %<report>\ProvidesClass{jsreport} %<jspf>\ProvidesClass{jspf} %<kiyou>\ProvidesClass{kiyou} +%<minijs>\ProvidesPackage{minijs} %<*driver> \ProvidesFile{jsclasses.dtx} %</driver> - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -124,11 +125,26 @@ % % 以下では実際のコードに即して説明します。 % +% \texttt{minijs}は，\texttt{jsclasses}に似た設定を行うパッケージです。 +% +% \begin{macrocode} +%<*minijs> +%% if jsclasses loaded, abort loading this package +\ifx\@jsc@uplatextrue\@undefined\else + \PackageInfo{minijs}{jsclasses does not need minijs, exiting} + \expandafter\endinput +\fi +%% "fake" jsarticle +\expandafter\def\csname ver@jsarticle.cls\endcsname{} +%</minijs> +% \end{macrocode} +% % \begin{macro}{\jsc@clsname} % % 文書クラスの名前です。エラーメッセージ表示などで使われます。 % % \begin{macrocode} +%<*class> %<article>\def\jsc@clsname{jsarticle} %<book>\def\jsc@clsname{jsbook} %<report>\def\jsc@clsname{jsreport} @@ -746,6 +762,11 @@ % [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|， % |\stockheight|を定義するようにしました。 % +% [2020-10-04] \LaTeXe~2020-10-01でカーネルの |\shipout| コードが拡張され +% |\AtBeginDvi| の実行タイミングが変化したので，この時点で +% 発行する |\special| の中身を展開しておくようにしました。 +% こうしないと，用紙サイズ設定を間違ってしまいます(Issue \#72)。 +% % \begin{macrocode} \iftombow \newdimen\stockwidth \newdimen\stockheight @@ -756,10 +777,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi % \end{macrocode} % @@ -1059,6 +1081,24 @@ % $9.62216\,\mathrm{pt} * 0.961 / 10\,\mathrm{pt} = 0.924690$ です。 % % \begin{macrocode} +%</class> +%<*minijs> +%% min/goth -> jis/jisg (for pLaTeX only) +\ifx\ucs\@undefined +\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{% + \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax +} +\def\Cjascale{0.924690} +\DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{} +\DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{} +\DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{} +\DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{} +\fi +%</minijs> +%<*class> %<*!jspf> \def\Cjascale{0.924690} \ifmingoth @@ -1170,7 +1210,22 @@ % 従来のコードも\LaTeXe~2019-10-01以前のために残してありますが， % \texttt{mweights}パッケージ対策も施しました(forum:2763)。 % +% [2020-10-04] \LaTeXe~2020-10-01では |\AddToHook| を利用します。 +% +% ^^A Note that |\AddToHook| is defined as follows: +% ^^A \begin{itemize} +% ^^A \item Format date 2020-02-02 or older: undefined +% ^^A \item Format date 2020-10-01 or newer: available +% ^^A \item ... under \texttt{latexrelease} rollback: defined but no-op +% ^^A \end{itemize} +% % \begin{macrocode} +%</class> +%<*class|minijs> +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -1200,6 +1255,16 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END +%</class|minijs> +%<*class> % \end{macrocode} % % \begin{macro}{\textmc} @@ -1567,25 +1632,31 @@ % [2008-02-18] |english| オプションで |\parindent| を 1em にしました。 % % \begin{macrocode} +%</class> +%<*class|minijs> +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% -% \@nomath#1% +%<minijs> \@nomath#1% \ifx\protect\@typeset@protect \let\@currsize#1% \fi \fontsize{#2}{#3}\selectfont \ifdim\parindent>\z@ - \if@english - \parindent=1em - \else +%<class> \if@english +%<class> \parindent=1em +%<class> \else \parindent=1zw - \fi +%<class> \fi \fi \kanjiskip=0zw plus .1zw minus .01zw - \ifdim\xkanjiskip>\z@ - \if@slide \xkanjiskip=0.1em \else +%<class> \ifdim\xkanjiskip>\z@ +%<class> \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em - \fi - \fi} +%<class> \fi +%<class> \fi +} +%</class|minijs> +%<*class> % \end{macrocode} % \end{macro} % @@ -1694,7 +1765,12 @@ % ここで実際に標準フォントサイズで初期化します。 % % \begin{macrocode} +%</class> +%<*class|minijs> +%% initialize \normalsize +%</class|minijs> +%<*class> % \end{macrocode} % % \end{macro} @@ -6015,6 +6091,7 @@ \ignorespaces \fi} %</article|book|report> +%</class> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.ins b/Master/texmf-dist/source/platex/jsclasses/jsclasses.ins index 738af8a8fba..b7e4ca24abd 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.ins +++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.ins @@ -1,8 +1,18 @@ +\input docstrip +\preamble + +Maintained on GitHub: https://github.com/texjporg/jsclasses + +\endpreamble + \def\batchfile{jsclasses.ins} \input docstrip.tex \keepsilent -\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{article}} -\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{book}} -\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{report}} -\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{jspf}} -\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{kiyou}} +\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{class,article}} +\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{class,book}} +\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{class,report}} +\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{class,jspf}} +\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{class,kiyou}} +\generateFile{minijs.sty}{f}{\from{jsclasses.dtx}{minijs}} + +\endbatchfile diff --git a/Master/texmf-dist/source/platex/jsclasses/jslogo.ins b/Master/texmf-dist/source/platex/jsclasses/jslogo.ins index 26e1a43b1f0..0f8f287a42d 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jslogo.ins +++ b/Master/texmf-dist/source/platex/jsclasses/jslogo.ins @@ -1,4 +1,13 @@ +\input docstrip +\preamble + +Maintained on GitHub: https://github.com/texjporg/jsclasses + +\endpreamble + \def\batchfile{jslogo.ins} \input docstrip.tex \keepsilent \generateFile{jslogo.sty}{f}{\from{jslogo.dtx}{package}} + +\endbatchfile diff --git a/Master/texmf-dist/source/platex/jsclasses/jsverb.ins b/Master/texmf-dist/source/platex/jsclasses/jsverb.ins index 34dbbcf54fa..20279cfb8dd 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsverb.ins +++ b/Master/texmf-dist/source/platex/jsclasses/jsverb.ins @@ -1,4 +1,13 @@ +\input docstrip +\preamble + +Maintained on GitHub: https://github.com/texjporg/jsclasses + +\endpreamble + \def\batchfile{jsverb.ins} \input docstrip.tex \keepsilent \generateFile{jsverb.sty}{f}{\from{jsverb.dtx}{jsverb}} + +\endbatchfile diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.ins b/Master/texmf-dist/source/platex/jsclasses/okumacro.ins index 4e1c392dc22..57a45c97a0d 100644 --- a/Master/texmf-dist/source/platex/jsclasses/okumacro.ins +++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.ins @@ -1,4 +1,13 @@ +\input docstrip +\preamble + +Maintained on GitHub: https://github.com/texjporg/jsclasses + +\endpreamble + \def\batchfile{okumacro.ins} \input docstrip.tex \keepsilent \generateFile{okumacro.sty}{f}{\from{okumacro.dtx}{okumacro}} + +\endbatchfile diff --git a/Master/texmf-dist/source/platex/jsclasses/okuverb.ins b/Master/texmf-dist/source/platex/jsclasses/okuverb.ins index aa4e33f8a31..a9076d54d13 100644 --- a/Master/texmf-dist/source/platex/jsclasses/okuverb.ins +++ b/Master/texmf-dist/source/platex/jsclasses/okuverb.ins @@ -1,4 +1,13 @@ +\input docstrip +\preamble + +Maintained on GitHub: https://github.com/texjporg/jsclasses + +\endpreamble + \def\batchfile{okuverb.ins} \input docstrip.tex \keepsilent \generateFile{okuverb.sty}{f}{\from{okuverb.dtx}{okuverb}} + +\endbatchfile diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index a37668b1967..16b681feb35 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -4,28 +4,16 @@ %% %% The original source files were: %% -%% jsclasses.dtx (with options: `article') +%% jsclasses.dtx (with options: `class,article') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jsarticle.cls. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsclasses.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsarticle} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -259,10 +247,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi \newdimen\jsc@mpt @@ -463,6 +452,10 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -492,6 +485,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} @@ -700,6 +701,7 @@ \xspcode`^^fe=3 \xspcode`^^ff=3 \def\@{\spacefactor3000{}} +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -717,7 +719,8 @@ \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi - \fi} + \fi +} \def\jsc@setfontsize#1#2#3{% \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw @@ -748,6 +751,7 @@ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index 92a45c92d78..9b90912210b 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -4,28 +4,16 @@ %% %% The original source files were: %% -%% jsclasses.dtx (with options: `book') +%% jsclasses.dtx (with options: `class,book') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jsbook.cls. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsclasses.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsbook} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -264,10 +252,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi \newdimen\jsc@mpt @@ -468,6 +457,10 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -497,6 +490,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} @@ -705,6 +706,7 @@ \xspcode`^^fe=3 \xspcode`^^ff=3 \def\@{\spacefactor3000{}} +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -722,7 +724,8 @@ \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi - \fi} + \fi +} \def\jsc@setfontsize#1#2#3{% \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw @@ -753,6 +756,7 @@ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty b/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty index 01d3c6f9b4a..0a3af1a9890 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty @@ -6,20 +6,8 @@ %% %% jslogo.dtx (with options: `package') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jslogo.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jslogo.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{jslogo} [2019/07/25 okumura, texjporg] diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index 5f670c73702..7776ce9d118 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -4,28 +4,16 @@ %% %% The original source files were: %% -%% jsclasses.dtx (with options: `jspf') +%% jsclasses.dtx (with options: `class,jspf') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jspf.cls. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsclasses.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] \def\jsc@clsname{jspf} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -255,10 +243,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi \def\n@baseline{14.554375} \newdimen\jsc@mpt @@ -459,6 +448,10 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -488,6 +481,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} @@ -696,6 +697,7 @@ \xspcode`^^fe=3 \xspcode`^^ff=3 \def\@{\spacefactor3000{}} +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -713,7 +715,8 @@ \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi - \fi} + \fi +} \def\jsc@setfontsize#1#2#3{% \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw @@ -744,6 +747,7 @@ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls index d4d42cfca21..cc6c3bfc45c 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls @@ -4,28 +4,16 @@ %% %% The original source files were: %% -%% jsclasses.dtx (with options: `report') +%% jsclasses.dtx (with options: `class,report') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jsreport.cls. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsclasses.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsreport} - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsreport} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -260,10 +248,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi \newdimen\jsc@mpt @@ -464,6 +453,10 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -493,6 +486,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} @@ -701,6 +702,7 @@ \xspcode`^^fe=3 \xspcode`^^ff=3 \def\@{\spacefactor3000{}} +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -718,7 +720,8 @@ \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi - \fi} + \fi +} \def\jsc@setfontsize#1#2#3{% \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw @@ -749,6 +752,7 @@ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsverb.sty b/Master/texmf-dist/tex/platex/jsclasses/jsverb.sty index 38274f1c19a..9f82139e9e6 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsverb.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/jsverb.sty @@ -6,20 +6,8 @@ %% %% jsverb.dtx (with options: `jsverb') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from jsverb.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsverb.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsverb.sty}[2007/01/28 okumura] \newif\if@yen \@yenfalse diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index ccdca01dcda..d56aaab4a93 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -4,28 +4,16 @@ %% %% The original source files were: %% -%% jsclasses.dtx (with options: `kiyou') +%% jsclasses.dtx (with options: `class,kiyou') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from kiyou.cls. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file jsclasses.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2020/02/02 jsclasses (okumura, texjporg)] + [2020/10/05 jsclasses (okumura, texjporg)] \def\jsc@clsname{kiyou} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -255,10 +243,11 @@ \fi \ifpapersize \iftombow - \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} + \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight} \else - \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} + \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight} \fi + \AtBeginDvi{\special{\jsc@papersize@special}} \fi \def\n@baseline{14.897} \newdimen\jsc@mpt @@ -470,6 +459,10 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -499,6 +492,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} @@ -707,6 +708,7 @@ \xspcode`^^fe=3 \xspcode`^^ff=3 \def\@{\spacefactor3000{}} +%% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -724,7 +726,8 @@ \if@slide \xkanjiskip=0.1em \else \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi - \fi} + \fi +} \def\jsc@setfontsize#1#2#3{% \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw @@ -755,6 +758,7 @@ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} diff --git a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty index da464a3a31e..4dc49fa164c 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty @@ -1,18 +1,27 @@ -% minimal jsarticle-like fonts -% +%% +%% This is file `minijs.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% jsclasses.dtx (with options: `minijs') +%% +%% Maintained on GitHub: https://github.com/texjporg/jsclasses +%% +\ifx\epTeXinputencoding\undefined\else + \epTeXinputencoding utf8 % ^^A added (2017-10-04) +\fi \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{minijs}[2018/02/04 okumura, texjporg] -% -% if jsclasses loaded, abort loading this package +\ProvidesPackage{minijs} + [2020/10/05 jsclasses (okumura, texjporg)] +%% if jsclasses loaded, abort loading this package \ifx\@jsc@uplatextrue\@undefined\else \PackageInfo{minijs}{jsclasses does not need minijs, exiting} \expandafter\endinput \fi -% -% "fake" jsarticle +%% "fake" jsarticle \expandafter\def\csname ver@jsarticle.cls\endcsname{} -% -% min/goth -> jis/jisg (for pLaTeX only) +%% min/goth -> jis/jisg (for pLaTeX only) \ifx\ucs\@undefined \@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{% \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax @@ -26,18 +35,11 @@ \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{} \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{} \fi -% -% \@setfontsize with \parindent and \(x)kanjiskip settings -\def\@setfontsize#1#2#3{\@nomath#1% - \ifx\protect\@typeset@protect - \let\@currsize#1% - \fi - \fontsize{#2}{#3}\selectfont - \ifdim\parindent>\z@ \parindent=1zw \fi - \kanjiskip=0zw plus .1zw minus .01zw - \xkanjiskip=0.25em plus 0.15em minus 0.06em} -% -% ad-hoc "relation font" +%% ad-hoc "relation font" +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN +\ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} @@ -47,6 +49,48 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\AtBeginDocument{% + \ifx\mweights@init\@undefined\else % mweights.sty is loaded + % my definitions above should have been overwritten, recover it! + % \selectfont is executed twice but I don't care about speed... + \expandafter\g@addto@macro\csname rmfamily \endcsname + {\kanjifamily\mcdefault\selectfont}% + \expandafter\g@addto@macro\csname sffamily \endcsname + {\kanjifamily\gtdefault\selectfont}% + \expandafter\g@addto@macro\csname ttfamily \endcsname + {\kanjifamily\gtdefault\selectfont}% + \fi} +\else % 2020-02-02 +\g@addto@macro\@rmfamilyhook + {\prepare@family@series@update@kanji{mc}\mcdefault} +\g@addto@macro\@sffamilyhook + {\prepare@family@series@update@kanji{gt}\gtdefault} +\g@addto@macro\@ttfamilyhook + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END +%% \@setfontsize with \parindent and \(x)kanjiskip settings +\def\@setfontsize#1#2#3{% + \@nomath#1% + \ifx\protect\@typeset@protect + \let\@currsize#1% + \fi + \fontsize{#2}{#3}\selectfont + \ifdim\parindent>\z@ + \parindent=1zw + \fi + \kanjiskip=0zw plus .1zw minus .01zw + \xkanjiskip=0.25em plus 0.15em minus 0.06em +} +%% initialize \normalsize -% \endinput +%% +%% End of file `minijs.sty'. diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty index bfafb6f2870..c43c16d6adf 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty @@ -6,20 +6,8 @@ %% %% okumacro.dtx (with options: `okumacro') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from okumacro.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file okumacro.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \ifx\epTeXinputencoding\undefined\else \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi diff --git a/Master/texmf-dist/tex/platex/jsclasses/okuverb.sty b/Master/texmf-dist/tex/platex/jsclasses/okuverb.sty index 97057523136..c91358b5e15 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/okuverb.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/okuverb.sty @@ -6,20 +6,8 @@ %% %% okuverb.dtx (with options: `okuverb') %% -%% IMPORTANT NOTICE: +%% Maintained on GitHub: https://github.com/texjporg/jsclasses %% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from okuverb.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file okuverb.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{okuverb.sty}[2003/09/03 okumura] \newif\if@yen \@yenfalse |