summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/jsclasses
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-10-06 03:01:44 +0000
committerNorbert Preining <norbert@preining.info>2020-10-06 03:01:44 +0000
commit2884d8fdd76b2def1d759c76c03141710c219ad7 (patch)
tree8b94b805c643d5322fe4a764eab683dc369718a3 /macros/latex/contrib/jsclasses
parent07723a50707217d2d397c098ec67af793cdfa916 (diff)
CTAN sync 202010060301
Diffstat (limited to 'macros/latex/contrib/jsclasses')
-rw-r--r--macros/latex/contrib/jsclasses/Makefile5
-rw-r--r--macros/latex/contrib/jsclasses/README.md2
-rw-r--r--macros/latex/contrib/jsclasses/jsclasses.dtx103
-rw-r--r--macros/latex/contrib/jsclasses/jsclasses.ins20
-rw-r--r--macros/latex/contrib/jsclasses/jsclasses.pdfbin482131 -> 412093 bytes
-rw-r--r--macros/latex/contrib/jsclasses/jslogo.ins9
-rw-r--r--macros/latex/contrib/jsclasses/jslogo.pdfbin91756 -> 76779 bytes
-rw-r--r--macros/latex/contrib/jsclasses/jsverb.ins9
-rw-r--r--macros/latex/contrib/jsclasses/jsverb.pdfbin86516 -> 75649 bytes
-rw-r--r--macros/latex/contrib/jsclasses/minijs.sty52
-rw-r--r--macros/latex/contrib/jsclasses/okumacro.ins9
-rw-r--r--macros/latex/contrib/jsclasses/okumacro.pdfbin213086 -> 173352 bytes
-rw-r--r--macros/latex/contrib/jsclasses/okuverb.ins9
-rw-r--r--macros/latex/contrib/jsclasses/okuverb.pdfbin67501 -> 59902 bytes
14 files changed, 145 insertions, 73 deletions
diff --git a/macros/latex/contrib/jsclasses/Makefile b/macros/latex/contrib/jsclasses/Makefile
index b7af18707d..3e91b82d58 100644
--- a/macros/latex/contrib/jsclasses/Makefile
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/README.md b/macros/latex/contrib/jsclasses/README.md
index e051a09a40..f860393a45 100644
--- a/macros/latex/contrib/jsclasses/README.md
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/jsclasses.dtx b/macros/latex/contrib/jsclasses/jsclasses.dtx
index 8e6642b329..941b08c4f3 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/jsclasses.ins b/macros/latex/contrib/jsclasses/jsclasses.ins
index 738af8a8fb..b7e4ca24ab 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/jsclasses.pdf b/macros/latex/contrib/jsclasses/jsclasses.pdf
index 63ff3c6e69..6288f723c2 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.pdf
+++ b/macros/latex/contrib/jsclasses/jsclasses.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/jslogo.ins b/macros/latex/contrib/jsclasses/jslogo.ins
index 26e1a43b1f..0f8f287a42 100644
--- a/macros/latex/contrib/jsclasses/jslogo.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/jslogo.pdf b/macros/latex/contrib/jsclasses/jslogo.pdf
index edb8926c78..6975d75515 100644
--- a/macros/latex/contrib/jsclasses/jslogo.pdf
+++ b/macros/latex/contrib/jsclasses/jslogo.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/jsverb.ins b/macros/latex/contrib/jsclasses/jsverb.ins
index 34dbbcf54f..20279cfb8d 100644
--- a/macros/latex/contrib/jsclasses/jsverb.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/jsverb.pdf b/macros/latex/contrib/jsclasses/jsverb.pdf
index cf1162f27e..a2273084a5 100644
--- a/macros/latex/contrib/jsclasses/jsverb.pdf
+++ b/macros/latex/contrib/jsclasses/jsverb.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/minijs.sty b/macros/latex/contrib/jsclasses/minijs.sty
deleted file mode 100644
index da464a3a31..0000000000
--- a/macros/latex/contrib/jsclasses/minijs.sty
+++ /dev/null
@@ -1,52 +0,0 @@
-% minimal jsarticle-like fonts
-%
-\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{minijs}[2018/02/04 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
-\expandafter\def\csname ver@jsarticle.cls\endcsname{}
-%
-% 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
-%
-% \@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"
-\DeclareRobustCommand\rmfamily
- {\not@math@alphabet\rmfamily\mathrm
- \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
-\DeclareRobustCommand\sffamily
- {\not@math@alphabet\sffamily\mathsf
- \romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
-\DeclareRobustCommand\ttfamily
- {\not@math@alphabet\ttfamily\mathtt
- \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
-\normalsize
-%
-\endinput
diff --git a/macros/latex/contrib/jsclasses/okumacro.ins b/macros/latex/contrib/jsclasses/okumacro.ins
index 4e1c392dc2..57a45c97a0 100644
--- a/macros/latex/contrib/jsclasses/okumacro.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/okumacro.pdf b/macros/latex/contrib/jsclasses/okumacro.pdf
index 1f7e21ce5c..78b40bb433 100644
--- a/macros/latex/contrib/jsclasses/okumacro.pdf
+++ b/macros/latex/contrib/jsclasses/okumacro.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/okuverb.ins b/macros/latex/contrib/jsclasses/okuverb.ins
index aa4e33f8a3..a9076d54d1 100644
--- a/macros/latex/contrib/jsclasses/okuverb.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/jsclasses/okuverb.pdf b/macros/latex/contrib/jsclasses/okuverb.pdf
index b5da6698d5..b8014b3c66 100644
--- a/macros/latex/contrib/jsclasses/okuverb.pdf
+++ b/macros/latex/contrib/jsclasses/okuverb.pdf
Binary files differ