OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ltj-jfont.lua etc.: use data of UTR#50
[luatex-ja/luatexja.git]
/
src
/
ltjskiyou.cls
diff --git
a/src/ltjskiyou.cls
b/src/ltjskiyou.cls
index
cb2be54
..
f8f52e1
100644
(file)
--- a/
src/ltjskiyou.cls
+++ b/
src/ltjskiyou.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [201
6/10/13
ltjsclasses ]
+ [201
7/03/06
ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
@@
-98,7
+98,6
@@
\newif\if@slide
\@slidefalse
\def\jsc@magscale{1}
\newif\if@slide
\@slidefalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
@@
-217,7
+216,9
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@
-250,9
+251,10
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
-\if@ltjs@mag@xreal
\RequirePackage{type1cm}
+\if@ltjs@mag@xreal
\ifdim\jsc@mpt=\p@\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\ifdim\jsc@mpt=\p@\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
\newluafunction\ltjs@@magnify@font@calc
\begingroup\catcode`\%=12\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
\newluafunction\ltjs@@magnify@font@calc
\begingroup\catcode`\%=12\relax
@@
-260,11
+262,11
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
- tex.sprint(math.floor(0.5+mpt*getdimen('dimen@')))
+ tex.sprint(
-2,
math.floor(0.5+mpt*getdimen('dimen@')))
end
function luatexja.ltjs_unmagnify_fsize(a)
local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536))
end
function luatexja.ltjs_unmagnify_fsize(a)
local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536))
- tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s )
+ tex.sprint(
-2,
(s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-272,7
+274,7
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc@magscale*1000))
+ tex.sprint(
-2,
math.floor(0.5+\jsc@magscale*1000))
}}%
\else
\dimen@\@tempb\relax
}}%
\else
\dimen@\@tempb\relax
@@
-290,20
+292,31
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\expandafter\endgroup\@tempa
}
\fi\fi
\expandafter\endgroup\@tempa
}
\fi\fi
-\newlength{\stockwidth}
-\newlength{\stockheight}
-\setlength{\stockwidth}{\paperwidth}
-\setlength{\stockheight}{\paperheight}
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\iftombow
+ \newlength{\stockwidth}
+ \newlength{\stockheight}
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\advance \stockheight 2in
\advance \stockwidth 2in
\advance \stockheight 2in
-\fi
-\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\stockwidth}
- \setlength{\pdfpageheight}{\stockheight}
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
+ \else
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
+ \fi
\else
\else
- \setlength{\pagewidth}{\stockwidth}
- \setlength{\pageheight}{\stockheight}
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\paperwidth}
+ \setlength{\pdfpageheight}{\paperheight}
+ \else
+ \setlength{\pagewidth}{\paperwidth}
+ \setlength{\pageheight}{\paperheight}
+ \fi
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@
-478,6
+491,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\fi
\setlength\headheight{0\jsc@mpt}
\setlength\headsep{0\jsc@mpt}
\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{48\zw}
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
\setlength\fullwidth{48\zw}
@@
-514,7
+529,7
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\if@slide
\addtolength\topmargin{-\headheight}
\else
\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}
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@
-625,9
+640,9
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \
jsc@
smallskip
\@title
\@title
- \smallskip
+ \
jsc@
smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@
-784,7
+799,7
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup \@svsechd \endgroup
\unskip
\@tempskipa #1\relax
\begingroup \@svsechd \endgroup
\unskip
\@tempskipa #1\relax
- \hskip -\@tempskipa\
@inhibitglue
+ \hskip -\@tempskipa\
ltjfakeparbegin
\else
\clubpenalty \@clubpenalty
\everypar{}%
\else
\clubpenalty \@clubpenalty
\everypar{}%
@@
-900,15
+915,16
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
+\newcommand{\jsParagraphMark}{■}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont
■
}}
+ {\normalfont\normalsize\headfont
\jsParagraphMark
}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont
■
}}
+ {\normalfont\normalsize\headfont
\jsParagraphMark
}}
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
@@
-1071,7
+1087,7
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \
setcounter{page}\@ne
+ \
ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
@@
-1351,7
+1367,7
@@
class has defined the old font commands like\MessageBreak
\parindent 1\zw
\noindent
\llap{\@makefnmark\hskip0.3\zw}#1}
\parindent 1\zw
\noindent
\llap{\@makefnmark\hskip0.3\zw}#1}
-\
protected\def\@inhibitglue{\directlua{luatexja.jfmglue.create_beginpar_node()}}
+\
let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
\@donoparitem
\def\@item[#1]{%
\if@noparitem
\@donoparitem
@@
-1394,7
+1410,7
@@
class has defined the old font commands like\MessageBreak
\else
\clubpenalty \@clubpenalty
\everypar{}%
\else
\clubpenalty \@clubpenalty
\everypar{}%
- \fi\
@inhibitglue
}%
+ \fi\
ltjfakeparbegin
}%
\if@noitemarg
\@noitemargfalse
\if@nmbrlist
\if@noitemarg
\@noitemargfalse
\if@nmbrlist
@@
-1419,7
+1435,7
@@
class has defined the old font commands like\MessageBreak
\@nolnerr
\else
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\@nolnerr
\else
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
- \inhibitglue
\ignorespaces
+ \inhibitglue\ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if@jslogo
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if@jslogo
@@
-1594,8
+1610,10
@@
class has defined the old font commands like\MessageBreak
\fi
\fi}
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
\fi
\fi}
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
-\
if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
+\
pagestyle{plain}
\pagenumbering{arabic}
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if@twocolumn
\twocolumn
\sloppy
\if@twocolumn
\twocolumn
\sloppy