X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=2d3d1c986e8e4f8367363557234976cd5121f03b;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=74f1c33959ca2fd11bbe7075be411279e767d0f9;hpb=3c2f5346fa635e1423ccd51441927a754e26a392;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 74f1c33..2d3d1c9 100644
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -10,7 +10,7 @@
%
% \fi
%
-% \CheckSum{4478}
+% \CheckSum{4509}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -76,7 +76,15 @@
% (ãããã¨ããããã¾ããé´æ¨ãï¼ MILNãã)}
% \changes{v1.6}{2006/06/27}{ãã©ã³ãã³ãã³ããä¿®æ£ããããã¨ããymtããã}
% \changes{v1.6-ltj}{2011/09/27}{jclasses.dtx v1.6 ããã¼ã¹ã«Lua\LaTeX-jaç¨ã«ä¿®æ£ã}
-% \changes{v1.6-ltj-2}{2011/09/27}{jclasses.dtx luatexja.cfgã«å¯¾å¿ï¼}
+% \changes{v1.6-ltj-2}{2013/06/06}{luatexja.cfgã«å¯¾å¿ï¼}
+% \changes{v1.6-ltj-3}{2014/06/08}{縦çµã¯ã©ã¹ã®æã®geometry.styã«å¯¾å¿ï¼}
+% \changes{v1.6-ltj-4}{2014/06/30}{çµæ¹åã®å¤æ´ç®æãç¾è¡ã®Lua\TeX-jaã®ä»æ§ã«åãããã«ä¿®æ£ï¼}
+% \changes{v1.6-ltj-5}{2014/07/02}{\cs{ifydir}, \cs{iftdir}ã使ããªãããã«ä¿®æ£ï¼}
+% \changes{v1.6-ltj-6}{2014/07/28}{縦çµã¯ã©ã¹ã§lltjext.styãèªã¿è¾¼ãããã«ä¿®æ£ï¼}
+% \changes{v1.6-ltj-7}{2014/11/15}{縦çµã¯ã©ã¹ã¨everyshi.styã¨ã®ç¸æ§ãæªãåé¡ãä¿®æ£ï¼}
+% \changes{v1.6-ltj-8}{2014/11/22}{縦çµæã®geometry.styã¸ã®å¯¾å¿ãå¥ãã¡ã¤ã«(lltjp-geometry.sty)ã«åé¢ï¼ããã«ä¼´ãv1.6-ltj-3ã§ã®å¤æ´ãåé¤ï¼}
+% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã¯ã©ã¹ã®æ¥ä»åºåã§ã¨ã©ã¼ã«ãªããã¨ãªã©ãä¿®æ£ï¼}
+% \changes{v1.6-ltj-10}{2015/10/18}{Lua\TeX\ 0.81.0ã«ä¼´ãããªããã£ãåã®å¤æ´ã«å¯¾å¿ï¼}
% \fi
%
% \iffalse
@@ -106,13 +114,14 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2013/06/06 v1.6-ltj-2
+ [2015/10/18 v1.6-ltj-10
% Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
]
\documentclass{ltjltxdoc}
\GetFileInfo{ltjclasses.dtx}
+\usepackage[ipaex,nfssonly]{luatexja-preset}
\usepackage[unicode]{hyperref}
\title{Lua\LaTeX-jaç¨\texttt{jclasses}äºæã¯ã©ã¹}
\author{Lua\TeX-jaããã¸ã§ã¯ã}
@@ -144,7 +153,7 @@
% 11pt & 11ptãµã¤ãºã®è¨å®ãçæ\\
% 12pt & 12ptãµã¤ãºã®è¨å®ãçæ\\
% bk & bookã¯ã©ã¹ç¨ã®ãµã¤ãºã®è¨å®ãçæ\\
-% tate & 縦çµç¨ã®è¨å®ãçæï¼ç¾å¨ç¡å¹ï¼\\
+% tate & 縦çµç¨ã®è¨å®ãçæ\\
% yoko & 横çµç¨ã®è¨å®ãçæ\\
% \end{tabular}
% \end{center}
@@ -160,6 +169,7 @@
% \end{quotation}
% ã®ã¨ã©ã¼ãèµ·ãã£ãå ´åã¯ã|lualatex-math|ããã±ã¼ã¸ãèªã¿è¾¼ãã§ã¿ã¦ä¸ããã
% \item åºåPDFã®ç¨ç´ãµã¤ãºãèªåçã«è¨å®ãããããã«ãã¦ããã¾ãã
+% %%%\item 縦çµã¿ã¯ã©ã¹ã«ããã¦ã|geometry|ããã±ã¼ã¸ãèªã¿è¾¼ãã ã¨ãã«æå³éãã«ãªããªãåé¡ã«å¯¾å¿ãã¾ããã%
% \end{itemize}
%
% \section{Lua\TeX-ja ã®èªã¿è¾¼ã¿}
@@ -371,15 +381,34 @@
%
% \subsection{çµæ¹åãªãã·ã§ã³}
% ãã®ãªãã·ã§ã³ãæå®ãããã¨ã縦çµã§çµçããã¾ãã
-% ãããLua\TeX-jaã§ã¯ã¾ã 縦çµã¯æªå¯¾å¿ãªã®ã§ã³ã¡ã³ãã¢ã¦ããã¾ãã
% \changes{v1.0g}{1997/01/25}{Insert \cs{hbox}, to switch tate-mode.}
% \changes{v1.1d}{1997/02/05}{éå§ãã¼ã¸ããããããªãã®ãä¿®æ£}
% \changes{v1.1f}{1997/07/08}{縦çµæã«ãã¼ã¹ã©ã¤ã³ããããããªãã®ãä¿®æ£}
+%
+% \changes{v1.6-ltj-4}{2014/06/30}{æ¬æã®çµæ¹åã \cs{AtBeginDocument} ã§
+% å¤æ´ãããã¨ãã§ããªããªã£ããã¨ã«å¯¾å¿}
+% \begin{macrocode}
+\DeclareOption{tate}{%
+ \tate\AtBeginDocument{\message{ã縦çµã¢ã¼ãã}\adjustbaseline}%
+}
+% \end{macrocode}
+%
+% 縦çµã¯ã©ã¹ã¨|everyshi|ããã±ã¼ã¸ã®ç¸æ§ãæªãåé¡ã«å¯¾å¦ãã¾ãã
+% ãã®å¦çã¯ãZRããã®|pxeveryshi|ããã±ã¼ã¸ã¨å®è³ªçã«åãå
容ã§ãã
% \begin{macrocode}
-%% \DeclareOption{tate}{%
-%% \AtBeginDocument{\tate\message{ã縦çµã¢ã¼ãã}%
-%% \adjustbaseline}%
-%% }
+%<*tate>
+\AtEndOfPackageFile{everyshi}{%
+ \def\@EveryShipout@Output{%
+ \setbox8\vbox{%
+ \yoko
+ \@EveryShipout@Hook
+ \@EveryShipout@AtNextHook
+ \global\setbox\luatexoutputbox=\box\luatexoutputbox
+ }%
+ \gdef\@EveryShipout@AtNextHook{}%
+ \@EveryShipout@Org@Shipout\box\luatexoutputbox
+ }}
+%
% \end{macrocode}
%
% \subsection{両é¢ãçé¢ãªãã·ã§ã³}
@@ -476,38 +505,8 @@
%
% \end{macrocode}
%
-% \subsection{ãªãã·ã§ã³ã®å®è¡}
-% ãªãã·ã§ã³ã®å®è¡ãããã³ãµã¤ãºã¯ã©ã¹ã®ãã¼ããè¡ãªãã¾ãã
-% \begin{macrocode}
-%<*article|report|book>
-%<*article>
-%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,tate}
-%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
-%
-%<*report>
-%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany,tate}
-%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
-%
-%<*book>
-%\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
-%\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
-%
-\ProcessOptions\relax
-%\input{ltjtbk1\@ptsize.clo}
-%\input{ltjtsize1\@ptsize.clo}
-%\input{ltjbk1\@ptsize.clo}
-%\input{ltjsize1\@ptsize.clo}
-% \end{macrocode}
-% 縦çµç¨ã¯ã©ã¹ãã¡ã¤ã«ã®å ´åã¯ãããã§\file{plext.sty}ãèªã¿è¾¼ã¾ãã¦ãã¾ããã
-% Lua\TeX-jaã§ã©ããªããã¯æªå®ã§ãã
-% \changes{v1.0e}{1996/03/21}{\cs{usepackage} to \cs{RequirePackage}}
-% \begin{macrocode}
-%%\RequirePackage{plext}
-%
-% \end{macrocode}
-%
-% \section{ãã©ã³ã}
-%
+% \subsection{ãã©ã³ãã¡ããªãã¯ã®å¤æ´}
+%
% Lua\LaTeX-jaã®æ¨æºã§ã¯ãOTFããã±ã¼ã¸ç±æ¥ã®ã¡ããªãã¯ã使ãããããã«ãªã£ã¦ãã¾ãã
% æ¬ã¯ã©ã¹ã§ã¯ããp\TeX ã®çµçã¨äºææ§ãã§ããã ãæããããä¾ãæ示ããããã
% \begin{itemize}
@@ -524,8 +523,10 @@
% è¨å®ã«å¯¾å¿ãã¾ããããã®2ã¤ã®å½ä»¤ã®å¤ã¯ã¦ã¼ã¶ãæ¥ã
ã®å©ç¨ã§ãã®é½åº¦æå®ãããã®ã§ã¯ãªãã
% ä½ããã®çç±ã§éåãè¾¼ã¿ãã©ã³ããæ£ããå©ç¨ã§ããªãå ´åã«ã®ã¿ |luatexja.cfg| ã«ãã£ã¦
% ã»ããããããã®ã§ãã
-%
%
+% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
+% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
+%
% \begin{macrocode}
%<*article|report|book>
\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
@@ -540,6 +541,39 @@
%
% \end{macrocode}
%
+% \subsection{ãªãã·ã§ã³ã®å®è¡}
+% ãªãã·ã§ã³ã®å®è¡ãããã³ãµã¤ãºã¯ã©ã¹ã®ãã¼ããè¡ãªãã¾ãã
+% \begin{macrocode}
+%<*article|report|book>
+%<*article>
+%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,tate}
+%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
+%
+%<*report>
+%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany,tate}
+%\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
+%
+%<*book>
+%\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
+%\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
+%
+\ProcessOptions\relax
+%\input{ltjtbk1\@ptsize.clo}
+%\input{ltjtsize1\@ptsize.clo}
+%\input{ltjbk1\@ptsize.clo}
+%\input{ltjsize1\@ptsize.clo}
+% \end{macrocode}
+% 縦çµç¨ã¯ã©ã¹ãã¡ã¤ã«ã®å ´åã¯ãããã§\file{plext.sty}ãèªã¿è¾¼ã¿ã¾ãã
+% \changes{v1.0e}{1996/03/21}{\cs{usepackage} to \cs{RequirePackage}}
+% \changes{v1.6-ltj-6}{2014/07/28}{Lua\TeX-jaã§ã¯ï¼ä»£ããã«\file{lltjext.sty}ãèªã¿è¾¼ã¿ã¾
+% ãï¼ããã¯\file{plext.sty}ãLua\TeX-jaç¨ã«æ¸ããªããããã®ã§ãï¼}
+% \begin{macrocode}
+%\RequirePackage{lltjext}
+%
+% \end{macrocode}
+%
+% \section{ãã©ã³ã}
+%
% ããã§ã¯ã\LaTeX{}ã®ãã©ã³ããµã¤ãºã³ãã³ãã®å®ç¾©ããã¦ãã¾ãã
% ãã©ã³ããµã¤ãºã³ãã³ãã®å®ç¾©ã¯ã次ã®ã³ãã³ããç¨ãã¾ãã
%
@@ -774,6 +808,8 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -782,15 +818,22 @@
% \begin{macro}{\pdfpageheight}
% åºåã®PDFã®ç¨ç´ãµã¤ãºãããã§è¨å®ãã¦ããã¾ãã
% |tombow|ãçã®ã¨ãã¯2ã¤ã³ã足ãã¦ããã¾ãã
+%
+% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ã§ã¯ããªããã£ãã®å称å¤æ´ããããã®ã§ï¼
+% ããã«åããã¦ããã¾ãï¼
+%
% \begin{macrocode}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
\iftombow
\advance \@tempdima 2in
\advance \@tempdimb 2in
\fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
+\ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\@tempdima}
+ \setlength{\pdfpageheight}{\@tempdimb}
+\else
+ \setlength{\pagewidth}{\@tempdima}
+ \setlength{\pageheight}{\@tempdimb}
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2120,7 +2163,7 @@
\newcommand{\maketitle}{\par
\begingroup
\renewcommand{\thefootnote}{\fnsymbol{footnote}}%
- \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
%<*tate>
\long\def\@makefntext##1{\parindent 1\zw\noindent
@@ -3037,7 +3080,7 @@
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
\list{\csname label\@enumctr\endcsname}{%
- \iftdir
+ \ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
\parskip\z@ \itemsep\z@ \parsep\z@
@@ -3065,7 +3108,7 @@
% \begin{macrocode}
\newcommand{\labelitemi}{\textbullet}
\newcommand{\labelitemii}{%
- \iftdir
+ \ifnum\ltjgetparameter{direction}=3
{\textcircled{~}}
\else
{\normalfont\bfseries\textendash}
@@ -3090,7 +3133,7 @@
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
\expandafter
\list{\csname \@itemitem\endcsname}{%
- \iftdir
+ \ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
\parskip\z@ \itemsep\z@ \parsep\z@
@@ -3115,7 +3158,7 @@
% \begin{macrocode}
\newenvironment{description}
{\list{}{\labelwidth\z@ \itemindent-\leftmargin
- \iftdir
+ \ifnum\ltjgetparameter{direction}=3
\leftmargin\leftskip \advance\leftmargin3\Cwd
\rightmargin\rightskip
\labelsep=1\zw \itemsep\z@
@@ -3352,11 +3395,11 @@
% \begin{macrocode}
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+ \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
\else\sbox\@tempboxa{#1: #2}%
\fi
\ifdim \wd\@tempboxa >\hsize
- \iftdir #1\hskip1\zw#2\relax\par
+ \ifnum\ltjgetparameter{direction}=3 #1\hskip1\zw#2\relax\par
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
@@ -4061,17 +4104,20 @@
%
% \begin{macro}{\today}
% 縦çµã®å ´åã¯ãæ¼¢æ°åã§åºåãã¾ãã
+%
+% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã§ã¯ï¼ãã®æ¼¢æ°åã«ããæ¥ä»åºåã§ã¨ã©ã¼ã«ãªãã¾ããï¼
+% Lua\TeX-ja ã§ã¯ï¼\cs{kansuji}ã®å¾ã«\cs{number}ãç¶ãããã¨ã¯åºæ¥ãªãã®ã§\cs{number}ãåé¤ãã¾ããï¼}
% \begin{macrocode}
\def\today{{%
- \iftdir
+ \ifnum\ltjgetparameter{direction}=3
\if西æ¦
- \kansuji\number\year å¹´
- \kansuji\number\month æ
- \kansuji\number\day æ¥
+ \kansuji\year å¹´
+ \kansuji\month æ
+ \kansuji\day æ¥
\else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\number\heisei å¹´\fi
- \kansuji\number\month æ
- \kansuji\number\day æ¥
+ å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\heisei å¹´\fi
+ \kansuji\month æ
+ \kansuji\day æ¥
\fi
\else
\if西æ¦