summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
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/tex/platex
parent251de2b9d157c836ea7ac00129814c1f57e32cf1 (diff)
jsclasses (8oct16)
git-svn-id: svn://tug.org/texlive/trunk@42237 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls8
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls12
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls8
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/okumacro.sty7
5 files changed, 22 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index 386e0287943..5eb2e2829ac 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2016/09/08 okumura, texjporg]
+ [2016/10/08 okumura, texjporg]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -788,6 +788,8 @@
\fi
\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}
@@ -807,7 +809,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}
@@ -847,7 +849,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}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index 03ca22df5ee..02b7cd6796b 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2016/09/08 okumura, texjporg]
+ [2016/10/08 okumura, texjporg]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -88,10 +88,6 @@
\newif\ifjsc@mag\jsc@magtrue
\newif\ifjsc@mag@xreal\jsc@mag@xrealfalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{%
- \@slidetrue\def\jsc@magscale{3.583}
- \renewcommand{\@ptsize}{26}
- \@landscapetrue\@titlepagetrue}
\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}}
@@ -798,6 +794,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
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
@@ -822,7 +820,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}
@@ -862,7 +860,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}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index 145c95b6d34..0373546d5da 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2016/09/08 okumura, texjporg]
+ [2016/10/08 okumura, texjporg]
\def\jsc@clsname{jspf}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -86,10 +86,6 @@
\newif\ifjsc@mag\jsc@magtrue
\newif\ifjsc@mag@xreal\jsc@mag@xrealfalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{%
- \@slidetrue\def\jsc@magscale{3.583}
- \renewcommand{\@ptsize}{26}
- \@landscapetrue\@titlepagetrue}
\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}}
@@ -822,7 +818,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}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index 49e2a07b7f0..ba4c2492d8c 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2016/09/08 okumura, texjporg]
+ [2016/10/08 okumura, texjporg]
\def\jsc@clsname{kiyou}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -86,10 +86,6 @@
\newif\ifjsc@mag\jsc@magtrue
\newif\ifjsc@mag@xreal\jsc@mag@xrealfalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{%
- \@slidetrue\def\jsc@magscale{3.583}
- \renewcommand{\@ptsize}{26}
- \@landscapetrue\@titlepagetrue}
\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}}
@@ -799,6 +795,8 @@
\fi
\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)
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
\setlength\fullwidth{48zw}
@@ -839,7 +837,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}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
index 1fe7a935afe..4190b96dacc 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{okumacro}[2016/08/16 okumura, texjporg]
+\ProvidesPackage{okumacro}[2016/10/08 okumura, texjporg]
\providecommand{\rubyfamily}{}
\def\kanjistrut{\iftdir
\vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -300,6 +300,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}}%
% または \setbox\scb@x=\vbox\bgroup\advance \linewidth by -20pt \relax
{\end{minipage}\egroup