summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-08 23:36:15 +0000
committerKarl Berry <karl@freefriends.org>2016-10-08 23:36:15 +0000
commitbda7808e736ec9964636ba6c2ba585c59668c110 (patch)
treee8fee30357b6ab84c33b3225659e5063e85368c4 /Master/texmf-dist/source
parent251de2b9d157c836ea7ac00129814c1f57e32cf1 (diff)
jsclasses (8oct16)
git-svn-id: svn://tug.org/texlive/trunk@42237 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx29
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/okumacro.dtx27
2 files changed, 46 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index d47bb9666ce..af441d0b001 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -38,7 +38,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
- [2016/09/08 okumura, texjporg]
+ [2016/10/08 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -309,15 +309,20 @@
%
% [2016-07-24] $B%*%W%F%#%+%k%5%$%:$rD4@0$9$k$?$a$K(BNFSS$B$X%Q%C%A$rEv$F$k%*%W%7%g%s(B \texttt{nomag*} $B$r?7@_$7$^$7$?!#(B
%
+% [2016-10-08] \texttt{slide} $B%*%W%7%g%s$O(B article $B0J30$G$O;H$$J*$K$J$i$J$+$C$?$N$G!$(B
+% $B4JC1$N$?$a(B article $B$N$_$G;H$($k%*%W%7%g%s$H$7$^$7$?!#(B
+%
% \begin{macrocode}
\newcommand{\@ptsize}{0}
\newif\ifjsc@mag\jsc@magtrue
\newif\ifjsc@mag@xreal\jsc@mag@xrealfalse
\def\jsc@magscale{1}
+%<*article>
\DeclareOption{slide}{%
\@slidetrue\def\jsc@magscale{3.583}
\renewcommand{\@ptsize}{26}
\@landscapetrue\@titlepagetrue}
+%</article>
\DeclareOption{8pt}{\def\jsc@magscale{0.833}\renewcommand{\@ptsize}{-2}}
\DeclareOption{9pt}{\def\jsc@magscale{0.913}\renewcommand{\@ptsize}{-1}}
\DeclareOption{10pt}{\def\jsc@magscale{1}\renewcommand{\@ptsize}{0}}
@@ -1891,10 +1896,16 @@
% $B$=$l0J30$G(B25pt$B!JLs(B8.79mm$B!K$K$J$C$F$$$^$7$?!#(B
% $B$3$3$G$O(B article $B$O(B |\footskip| $-$ |\topskip| $B$H$7$^$7$?!#(B
%
+% [2016-10-08] article $B$N(B \texttt{slide} $B$N$H$-!$(B
+% $B$*$h$S(B book $B$NHs(B \texttt{report} $B$H(B kiyou $B$N$H$-$K(B |\headsep| $B$r(B
+% $B8:$i$7$=$3$M$F$$$?$N$r=$@5$7$^$7$?!J(B2016-08-17$B$G$N=$@5O3$l!K!#(B
+%
% \begin{macrocode}
%<*article>
\if@slide
\setlength\headsep{0\jsc@mpt}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -1906,6 +1917,8 @@
\addtolength\headsep{-\topskip}
\else
\setlength\headsep{6\jsc@mmm}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\fi
%</book>
%<*jspf>
@@ -1915,6 +1928,8 @@
%<*kiyou>
\setlength\headheight{0\jsc@mpt}
\setlength\headsep{0\jsc@mpt}
+\addtolength\headsep{-\topskip}%% added (2016-10-08)
+\addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
%</kiyou>
% \end{macrocode}
% \end{macro}
@@ -2025,6 +2040,9 @@
% [2016-08-26] |\topskip| $B$r(B10pt$B$+$i(B1.38zw$B$KA}$d$7$^$7$?$N$G!$(B
% $B$=$NJ,(B |\textheight| $B$rA}$d$7$^$9!J(B2016-08-17$B$G$N=$@5O3$l!K!#(B
%
+% [2016-10-08] article $B$N(B slide $B$N$H$-$K(B |\headheight| $B$O%<%m(B
+% $B$J$N$G!$$5$i$K=$@5$7$^$7$?!J(B2016-08-17$B$G$N=$@5O3$l!K!#(B
+%
% \begin{macrocode}
%<*article|book>
\if@slide
@@ -2032,7 +2050,7 @@
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -2145,7 +2163,7 @@
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -5135,6 +5153,11 @@
% [2003-08-15] |\textasteriskcentered| $B$G$O%U%)%s%H$K$h$C$F(B
% $B2<$,$j$9$.$k$N$GJQ99$7$^$7$?!#(B
%
+% [2016-10-08] TODO: $B5SCmHV9f$,(B |newtxtext| $B$d(B |newpxtext| $B$N;HMQ;~$K(B
+% $B$*$+$7$/$J$C$F$7$^$$$^$9!#$3$l$i$N%Q%C%1!<%8$OFbIt$G(B |\thefootnote| $B$r(B
+% $B:FDj5A$7$F$$$^$9$N$G!$5$$K$J$k>l9g$O%Q%C%1!<%8$rFI$_9~$`$H$-$K(B
+% \texttt{defaultsups} $B%*%W%7%g%s$rIU$1$F$/$@$5$$(B(qa:57284, qa:57287)$B!#(B
+%
% \begin{macrocode}
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index f0e608279a5..b2c8e835e87 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -11,7 +11,7 @@
% $B$F$$$^$9$N$G!$;d$N$b$N$b$=$l$K=`$8$F!J(Bmodified$B!K(BBSD$B$H$9$k$3$H$K$7$^$9!#(B
%
%<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2016/08/16 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2016/10/08 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -46,6 +46,11 @@
% $B=8$a$?$b$N$G$9!#:n$C$?$@$1$G%F%9%H$b$7$F$$$J$$$b$N$J$I$b:.$8$C$F$$$k(B
% $B2DG=@-$,$"$j$^$9!#35$7$FB>$NJ}$K$O$"$^$jMxMQ2ACM$,$J$$$b$N$G$9!#(B
%
+% [2016-07-30] $B=>Mh$O!$(Bascmac$B"*(Bokumacro$B$N=g$KFI$_9~$s$@>l9g$K%(%i!<$,=P$F(B
+% $B$$$^$7$?$,!$?7$7$$;EMM$G$O!$(Bascmac$B$H(Bokumacro$B$NN>J}$rFI$_9~$`>l9g$K$O(B
+% $B!V8e$KFI$_9~$s$@$[$&!W$,>!$A$^$9!#(B
+% $B6qBNE*$K$O(B |\keytop|$B!$(B|\return|$B!$(Bscreen$B4D6-!$(Bshadebox$B4D6-$,$"$j$^$9!#(B
+%
% \section{$B?tCM=8(B}
%
% \begin{itemize}
@@ -69,11 +74,6 @@
%
% $B0J2<$,<B:]$N%^%/%m=8$G$9!#(B
%
-% [2016-07-30] $B=>Mh$O!$(Bascmac$B"*(Bokumacro$B$N=g$KFI$_9~$s$@>l9g$K%(%i!<$,=P$F(B
-% $B$$$^$7$?$,!$?7$7$$;EMM$G$O!$(Bascmac$B$H(Bokumacro$B$NN>J}$rFI$_9~$`>l9g$K$O(B
-% $B!V8e$KFI$_9~$s$@$[$&!W$,>!$A$^$9!#(B
-% $B6qBNE*$K$O(B |\keytop|$B!$(B|\return|$B!$(Bscreen$B4D6-!$(Bshadebox$B4D6-$,$"$j$^$9!#(B
-%
% \begin{macrocode}
%<*okumacro>
% \end{macrocode}
@@ -99,7 +99,9 @@
%
% [2016-08-16] $B=DAH$KBP1~!#(B
%
-% [2016-08-16] $B!VA0$K(B |\kanjiskip| $B$,F~$i$J$$!W!VA08e$N2$J8J8;z$H$N4V$K(B |\xkanjiskip| $B$,F~$i$J$$!W!V8e$m$N6XB'=hM}$,8z$+$J$$!WLdBj$r2r7h$9$k$?$a$KOBJ8%4!<%9%H=hM}$rDI2C!#(B
+% [2016-08-16] $B!VA0$K(B |\kanjiskip| $B$,F~$i$J$$!W(B
+% $B!VA08e$N2$J8J8;z$H$N4V$K(B |\xkanjiskip| $B$,F~$i$J$$!W(B
+% $B!V8e$m$N6XB'=hM}$,8z$+$J$$!WLdBj$r2r7h$9$k$?$a$KOBJ8%4!<%9%H=hM}$rDI2C!#(B
%
% \begin{macrocode}
\providecommand{\rubyfamily}{}
@@ -782,6 +784,11 @@
% $B%9%/%j!<%sIw$N4D6-$K$J$j$^$9$7!$(Bascmac$B$,>!$D>l9g$O3Q$N4]$_$r;XDj$G$-$k(B
% $B%9%/%j!<%sIw$N4D6-$K$J$j$^$9!#(B
%
+% [2016-10-08] $B2hLL=PNONc$,%3%i%`I}$rD6$($k>l9g$NBP=hK!$H$7$F2#G\N(;XDj$N(B
+% $B%*%W%7%g%s$rDI2C$7$^$7$?$,!$F1$8OHFb$K2~9T2DG=$JJ8>O$b4^$^$l$k>l9g$K(B
+% $BOH$N1&C<$+$iN%$l$?IT<+A3$J0LCV!J2#G\N($r=L$a$J$$>l9g$KC<$K$"$?$C$F$$$?(B
+% $B0LCV!K$G2~9T$7$F$$$^$7$?!#$3$l$r=$@5$7$^$7$?!#(B
+%
% $B$^$?!$?7$?$K(Bokuscreen$B4D6-$rDI2C$7$^$9!#$3$l$O(Bascmac$B$H43>D$;$:!$>o$K2#$N(B
% $BG\N($r;XDj$G$-$k%9%/%j!<%sIw$N4D6-$K$J$j$^$9!#(B
%
@@ -792,6 +799,11 @@
\fi
\newenvironment{okuscreen}[1][1]%
{\def\screensc@le{#1}\@scw=\linewidth \advance \@scw by -20pt
+ \dimen1=#1\p@\relax
+ \@tempcnta=\dimen1\relax
+ \@tempcntb=65536\relax
+ \divide\@scw by \@tempcnta
+ \multiply\@scw by \@tempcntb
\setbox\scb@x=\hbox\bgroup\begin{minipage}[b]{\@scw}}%
% $B$^$?$O(B \setbox\scb@x=\vbox\bgroup\advance \linewidth by -20pt \relax
{\end{minipage}\egroup
@@ -1118,5 +1130,6 @@
%
% ^^A \endinput $B$N8e$K(B \CharacterTable $B$r=q$$$F$*$1$P!$;R%U%!%$%k$K$O(B
% ^^A $B=PNO$5$l$^$;$s!#%A%'%C%/$O(B *.dtx $B$r=hM}$7$?$H$-$K$7$F$/$l$^$9!#(B
+% ^^A [2016-09-03] $B"*:o=|$7$^$7$?!#(B
%
% \Finale