X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjsclasses.dtx;h=6bff5843602bb435f29f947109f982f33dd888a2;hb=db94e608b0fe848b08a050d4226f7fae8be1f87d;hp=dfc741609062542d9e5fccdc9a9abd4590dbb08b;hpb=601946768e65ee2f97c0bde07d90efe9a72dbe43;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index dfc7416..6bff584 100644
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -16,13 +16,13 @@
%
% Copyright 1993 1994 1995 1996 1997 1998 1999
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
+% in this file.
%
% Copyright 1995-1999 ASCII Corporation.
% -----------------------------------------
%
% \fi
-% \CheckSum{4988}
+% \CheckSum{5203}
%% \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
@@ -50,7 +50,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%
- [2013/06/06 ]
+ [2014/05/14 ]
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
@@ -111,7 +111,7 @@
%
% \subsection{\texttt{jsclasses.dtx}ããã®ä¸»ãªå¤æ´ç¹}
% å
¨ã¦ã®å¤æ´ç¹ãç¥ãããå ´åã¯ï¼|jsclasses.dtx| 㨠|ltjsclasses.dtx| 㧠|diff| ã
-% ã¨ã£ã¦ä¸ããã
+% ã¨ã£ã¦ä¸ãããzw, zh ã¯å
¨ã¦ |\zw|, |\zh| ã«ç½®ãæãããã¦ãã¾ãã
% \begin{itemize}
% \item ãã©ã³ãã¡ããªãã¯é¢ä¿ã®ãªãã·ã§ã³ |winjis |ã¯åã«ç¡è¦ããã¾ãã
% \item æ¨æºã§ã¯ |jfm-ujis.lua|ï¼Lua\TeX-jaæ¨æºã®ã¡ããªãã¯ï¼OTFããã±ã¼ã¸ã®ãã®ããã¼ã¹ï¼ã使ç¨ãã¾ãã
@@ -130,7 +130,9 @@
% ããããã㨠|grfext.sty| ãèªã¿è¾¼ãã éã«ã¨ã©ã¼ãå¼ãèµ·ããã®ã§åé¤ãã¾ããã
% \end{itemize}
%
-% \StopEventually
+% [2014-02-07 LTJ] jsclasses 2014-02-07 ãã¼ã¹ã«ãã¾ããï¼
+%
+% \StopEventually{}
%
% 以ä¸ã§ã¯å®éã®ã³ã¼ãã«å³ãã¦èª¬æãã¾ãã
% \section{Lua\TeX-jaã®èªã¿è¾¼ã¿}
@@ -146,7 +148,7 @@
% ããã㯠|\documentclass[ãªãã·ã§ã³]{ltjsarticle}|
% ã®ããã«å¼ã³åºãã¾ãã
%
-% æåã«ï¼ãªãã·ã§ã³ã«é¢é£ããããã¤ãã®ã³ãã³ããã¹ã¤ããï¼è«çå¤æ°ï¼ãå®
+% ã¾ãï¼ãªãã·ã§ã³ã«é¢é£ããããã¤ãã®ã³ãã³ããã¹ã¤ããï¼è«çå¤æ°ï¼ãå®
% 義ãã¾ãã
%
% \begin{macro}{\if@restonecol}
@@ -189,7 +191,7 @@
%
% \begin{macro}{\if@enablejfam}
%
-% åæãã©ã³ããæ°å¼ãã©ã³ãã¨ãã¦ç»é²ãããã©ããã示ãã¹ã¤ããã§ãã
+% åæãã©ã³ããæ°å¼ãã©ã³ãã¨ãã¦ç»é²ãããã©ããã示ãã¹ã¤ããã§ããï¼
% å®éã«ã¯ç¨ãããã¾ããã
%
% \begin{macrocode}
@@ -201,20 +203,20 @@
%
% \paragraph{ç¨ç´ãµã¤ãº}
%
-% JISãISOã®A0å¤ã¯é¢ç©$1\,\mathrm{m}^2$ï¼ç¸¦æ¨ªæ¯$1:\sqrt{2}$
-% ã®é·æ¹å½¢ã®è¾ºã®é·ããmmåä½ã«åãæ¨ã¦ããã®ã§ãã
-% ãããåºæºã¨ãã¦é ã«åæªãã¦ã¯mmåä½ã«åãæ¨ã¦ããã®ãA1ï¼A2ï¼â¦ã§ãã
+% JISãISOã®A0å¤ã¯é¢ç© $1\,\mathrm{m}^2$ï¼ç¸¦æ¨ªæ¯ $1:\sqrt{2}$
+% ã®é·æ¹å½¢ã®è¾ºã®é·ãã mm åä½ã«åãæ¨ã¦ããã®ã§ãã
+% ãããåºæºã¨ãã¦é ã«åæªãã¦ã¯ mm åä½ã«åãæ¨ã¦ããã®ãA1ï¼A2ï¼â¦ã§ãã
%
% Bå¤ã¯JISã¨ISOã§å®ç¾©ãç°ãªãã¾ãã
-% JISã§ã¯B0å¤ã®é¢ç©ã$1.5\,\mathrm{m}^2$ã§ããï¼
+% JISã§ã¯B0å¤ã®é¢ç©ã $1.5\,\mathrm{m}^2$ ã§ããï¼
% ISOã§ã¯B1å¤ã®è¾ºã®é·ããA0å¤ã¨A1å¤ã®è¾ºã®é·ãã®å¹¾ä½å¹³åã§ãã
-% ãããã£ã¦ISOã®B0å¤ã¯$1000\,\mathrm{mm} \times 1414\,\mathrm{mm}$ã§ãã
-% ãã®ããï¼\LaTeXe ã®\texttt{b5paper}
-% ã¯$250\,\mathrm{mm} \times 176\,\mathrm{mm}$ã§ããï¼
-% \pLaTeXe ã®\texttt{b5paper}
-% ã¯$257\,\mathrm{mm} \times 182\,\mathrm{mm}$ã«ãªã£ã¦ãã¾ãã
+% ãããã£ã¦ISOã®B0å¤ã¯ $1000\,\mathrm{mm} \times 1414\,\mathrm{mm}$ ã§ãã
+% ãã®ããï¼\LaTeXe ã® \texttt{b5paper}
+% 㯠$250\,\mathrm{mm} \times 176\,\mathrm{mm}$ ã§ããï¼
+% \pLaTeXe ã® \texttt{b5paper}
+% 㯠$257\,\mathrm{mm} \times 182\,\mathrm{mm}$ ã«ãªã£ã¦ãã¾ãã
% ããã§ã¯\pLaTeXe ã«ãªãã£ã¦JISã«å¾ãã¾ããã
-%
+%
% ããã©ã«ã㯠\texttt{a4paper} ã§ãã
%
% \texttt{b5var}ï¼B5å¤å½¢ï¼182mmÃ230mmï¼ï¼
@@ -283,7 +285,7 @@
%
% \paragraph{slide}
%
-% ãªãã·ã§ã³\texttt{slide}ãæ°è¨ãã¾ããã
+% ãªãã·ã§ã³ \texttt{slide} ãæ°è¨ãã¾ããã
%
% \begin{macrocode}
\newif\if@slide
@@ -292,8 +294,8 @@
%
% \paragraph{ãµã¤ãºãªãã·ã§ã³}
%
-% 10ptï¼11ptï¼12ptã®ã»ãã«ï¼8ptï¼9ptï¼14ptï¼17ptï¼21ptï¼25ptï¼30ptï¼36ptï¼43ptã追å ãã¾ããã
-% ããã¯çæ¯æ°åã«ãªãããã«é¸ãã ãã®ã§ãï¼å¾æ¥ã®20ptãæ®ãã¾ããï¼ã
+% 10ptï¼11ptï¼12pt ã®ã»ãã«ï¼8ptï¼9ptï¼14ptï¼17ptï¼21ptï¼25ptï¼30ptï¼36ptï¼43pt ã追å ãã¾ããã
+% ããã¯çæ¯æ°åã«ãªãããã«é¸ãã ãã®ã§ãï¼å¾æ¥ã® 20pt ãæ®ãã¾ããï¼ã
% |\@ptsize| ã®å®ç¾©ãå¤ã ã£ãã®ã§ãè¿·æãããããã¾ãããï¼
% æ¨æºçãªããã¥ã¡ã³ãã¯ã©ã¹ã¨åæ§ã«ãã¤ã³ãæ°ãã10ãå¼ãããã®ã«ç´ãã¾ããã
%
@@ -319,14 +321,18 @@
\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}}
\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}}
\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}}
+\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}}
+\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}}
+\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}}
+\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}}
% \end{macrocode}
%
% \paragraph{ãã³ããªãã·ã§ã³}
%
-% ãã³ã(crop marks)ãåºåãã¾ãã
+% ãã³ãï¼crop marksï¼ãåºåãã¾ãã
% å®éã®å¦ç㯠|lltjcore.sty| ã§è¡ãã¾ãã
-% ãªãã·ã§ã³\texttt{tombow}ã§æ¥ä»ä»ãã®ãã³ãï¼
-% ãªãã·ã§ã³\texttt{tombo}ã§æ¥ä»ãªãã®ãã³ããåºåãã¾ãã
+% ãªãã·ã§ã³ \texttt{tombow} ã§æ¥ä»ä»ãã®ãã³ãï¼
+% ãªãã·ã§ã³ \texttt{tombo} ã§æ¥ä»ãªãã®ãã³ããåºåãã¾ãã
% ãããã¯ã¢ã¹ãã¼çã®ã¾ã¾ã§ãã
% ã«ã¦ã³ã¿ |\hour|ï¼|\minute| 㯠|luatexja-compat.sty| ã§å®£è¨ããã¦ãã¾ãã
%
@@ -349,7 +355,7 @@
%
% \paragraph{é¢ä»ã}
%
-% ãªãã·ã§ã³\texttt{mentuke}ã§å¹
ã¼ãã®ãã³ããåºåãã¾ãã
+% ãªãã·ã§ã³ \texttt{mentuke} ã§å¹
ã¼ãã®ãã³ããåºåãã¾ãã
% é¢ä»ãã«ä¾¿å©ã§ãããããã¢ã¹ãã¼çã®ã¾ã¾ã§ãã
%
% \begin{macrocode}
@@ -361,9 +367,9 @@
%
% \paragraph{両é¢ï¼çé¢ãªãã·ã§ã³}
%
-% \texttt{twoside}ã§å¥æ°ãã¼ã¸ã»å¶æ°ãã¼ã¸ã®ã¬ã¤ã¢ã¦ããå¤ããã¾ãã
+% \texttt{twoside} ã§å¥æ°ãã¼ã¸ã»å¶æ°ãã¼ã¸ã®ã¬ã¤ã¢ã¦ããå¤ããã¾ãã
%
-% [2003-04-29] \texttt{vartwoside}ã§ã©ã¡ãã®ãã¼ã¸ãå注ãå³å´ã«ãªãã¾ãã
+% [2003-04-29] \texttt{vartwoside} ã§ã©ã¡ãã®ãã¼ã¸ãå注ãå³å´ã«ãªãã¾ãã
%
% \begin{macrocode}
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
@@ -373,7 +379,7 @@
%
% \paragraph{äºæ®µçµ}
%
-% \texttt{twocolumn}ã§äºæ®µçµã«ãªãã¾ãã
+% \texttt{twocolumn} ã§äºæ®µçµã«ãªãã¾ãã
%
% \begin{macrocode}
\DeclareOption{onecolumn}{\@twocolumnfalse}
@@ -382,7 +388,7 @@
%
% \paragraph{表é¡ãã¼ã¸}
%
-% \texttt{titlepage}ã§è¡¨é¡ã»æ¦è¦ãç¬ç«ãããã¼ã¸ã«åºåãã¾ãã
+% \texttt{titlepage} ã§è¡¨é¡ã»æ¦è¦ãç¬ç«ãããã¼ã¸ã«åºåãã¾ãã
%
% \begin{macrocode}
\DeclareOption{titlepage}{\@titlepagetrue}
@@ -392,7 +398,7 @@
% \paragraph{å³å·¦èµ·ãã}
%
% æ¸ç±ã§ã¯ç« ã¯é常ã¯å¥æ°ãã¼ã¸èµ·ããã«ãªãã¾ããï¼
-% \texttt{openany}ã§å¶æ°ãã¼ã¸ããã§ãå§ã¾ãããã«ãªãã¾ãã
+% \texttt{openany} ã§å¶æ°ãã¼ã¸ããã§ãå§ã¾ãããã«ãªãã¾ãã
%
% \begin{macrocode}
%\DeclareOption{openright}{\@openrighttrue}
@@ -428,8 +434,8 @@
% \end{macrocode}
% \end{environment}
%
-% \texttt{leqno}ã§æ°å¼çªå·ãå·¦å´ã«ãªãã¾ãã
-% \texttt{fleqn}ã§æ°å¼ãæ¬æ左端ããä¸å®è·é¢ã®ã¨ããã«åºåããã¾ãã
+% \texttt{leqno} ã§æ°å¼çªå·ãå·¦å´ã«ãªãã¾ãã
+% \texttt{fleqn} ã§æ°å¼ãæ¬æ左端ããä¸å®è·é¢ã®ã¨ããã«åºåããã¾ãã
% 森æ¬ããã«ãããã£ã¦è¨æ£ãã¾ããã
%
% \begin{macrocode}
@@ -493,7 +499,7 @@
%
% \paragraph{ãã©ãã}
%
-% \texttt{draft}ã§overfull boxã®èµ·ããè¡æ«ã«5ptã®ç½«ç·ãå¼ãã¾ãã
+% \texttt{draft} ã§overfull boxã®èµ·ããè¡æ«ã«5ptã®ç½«ç·ãå¼ãã¾ãã
%
% \begin{macrocode}
\newif\ifdraft
@@ -539,7 +545,7 @@
%
% \paragraph{è±èªå}
%
-% ãªãã·ã§ã³\texttt{english}ãæ°è¨ãã¾ããã
+% ãªãã·ã§ã³ \texttt{english} ãæ°è¨ãã¾ããã
%
% \begin{macrocode}
\newif\if@english
@@ -549,7 +555,7 @@
%
% \paragraph{ltjsreportç¸å½}
%
-% ãªãã·ã§ã³\texttt{report}ãæ°è¨ãã¾ããã
+% ãªãã·ã§ã³ \texttt{report} ãæ°è¨ãã¾ããã
%
% \begin{macrocode}
%<*book>
@@ -673,6 +679,22 @@
\mag 1077
\def\inv@mag{0.928505}
\fi
+\ifnum\@ptsize=1001
+ \mag 1085
+ \def\inv@mag{0.921659}
+\fi
+\ifnum\@ptsize=1051
+ \mag 1139
+ \def\inv@mag{0.877963}
+\fi
+\ifnum\@ptsize=1101
+ \mag 1194
+ \def\inv@mag{0.837521}
+\fi
+\ifnum\@ptsize=1201
+ \mag 1302
+ \def\inv@mag{0.768049}
+\fi
%<*kiyou>
\mag 977
\def\inv@mag{1.02354}
@@ -700,7 +722,7 @@
% \end{macro}
% \end{macro}
%
-% \section{åæãã©ã³ãã®é¸æ}
+% \section{åæãã©ã³ãã®å¤æ´}
%
% JISã®1ãã¤ã³ãã¯0.3514mmï¼ç´1/72.28ã¤ã³ãï¼ï¼
% PostScriptã®1ãã¤ã³ãã¯1/72ã¤ã³ãã§ããï¼
@@ -752,7 +774,7 @@
%
% æå¦ä¼èªã§ã¯ï¼
% åæãã©ã³ããPostScriptã®9ãã¤ã³ãã«ããããã«ï¼
-% $0.9*72.27/72 \simeq 0.903375$åãã¾ãã
+% $0.9*72.27/72 \simeq 0.903375$ åãã¾ãã
%
% \begin{macrocode}
%<*jspf>
@@ -775,6 +797,10 @@
% åæã§ã¤ã¿ãªãã¯ä½ï¼æä½ï¼ãµã³ã»ãªãä½ï¼
% ã¿ã¤ãã©ã¤ã¿ä½ã®ä»£ããã«ã´ã·ãã¯ä½ã使ããã¨ã«ãã¾ãã
%
+% [2014-03-25 LTJ] ã¿ã¤ãã©ã¤ã¿ä½ã«åããããã¡ããªã |\jttdefault| ã¨ãï¼
+% é常ã®ã´ã·ãã¯ä½ã¨å¥ã«ã§ããããã«ãã¾ããï¼|\jttdefault| ã¯ï¼æ¨æºã§
+% |\gtdefault| ã¨å®ç¾©ãã¦ãã¾ãï¼
+%
% [2003-03-16] ã¤ã¿ãªãã¯ä½ï¼æä½ã«ã¤ãã¦ï¼åæã§ã´ã·ãã¯ãå½ã¦ã¦ãã¾ãããï¼
% æ°å¦ã®å®çç°å¢ãªã©ã§å¤éã®ã¤ã¿ãªãã¯ä½ã使ããã¨ãããï¼ã´ã·ãã¯ã«
% ããã¨é»ã
ã¨ãªã£ã¦ãã¾ãã¨ããå¼å®³ãããã¾ããã
@@ -805,6 +831,7 @@
%% \DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\renewcommand\jttdefault{\gtdefault}
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -813,7 +840,7 @@
\romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
- \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+ \romanfamily\ttdefault\kanjifamily\jttdefault\selectfont}
% \end{macrocode}
%%
% Lua\TeX-jaã§ã¯åæçµçã«ä¼´ãã°ã«ã¼ã¯ãã¼ããã¼ã¹ã§æ¿å
¥ããããã«ãªãï¼ã¾ã
@@ -833,12 +860,12 @@
%
% ãã㯠|\pounds| å½ä»¤ã§å®éã«å¼ã³åºãããæåã§ãã
% å¾æ¥ããã®OT1ã¨ã³ã³ã¼ãã£ã³ã°ã§ã¯ |\$| ã®ã¤ã¿ãªãã¯ä½ã |\pounds|
-% ãªã®ã§\texttt{cmti}ã使ããã¦ãã¾ãããï¼
-% 1994å¹´æ¥ããã¯\texttt{cmu}ï¼upright italicï¼ç´ç«ã¤ã¿ãªãã¯ä½ï¼
+% ãªã®ã§ \texttt{cmti} ã使ããã¦ãã¾ãããï¼
+% 1994å¹´æ¥ãã㯠\texttt{cmu}ï¼upright italicï¼ç´ç«ã¤ã¿ãªãã¯ä½ï¼
% ã«å¤ããã¾ããã
-% ããã\texttt{cmu}ã¯ãã®æ§æ ¼ãããã¦å®é¨çãªãã®ã§ããï¼
+% ããã \texttt{cmu} ã¯ãã®æ§æ ¼ãããã¦å®é¨çãªãã®ã§ããï¼
% |\pounds| 以å¤ã§ä½¿ãããã¨ã¯æããªãã®ã§ï¼
-% ããã§ã¯\texttt{cmti}ã«æ»ãã¦ãã¾ãã¾ãã
+% ããã§ã¯ \texttt{cmti} ã«æ»ãã¦ãã¾ãã¾ãã
%
% [2003-08-20] Computer Modernãã©ã³ãã使ãæ©ä¼ãæ¸ãï¼T1ã¨ã³ã³ã¼ãã£ã³ã°
% ãä¸è¬çã«ãªã£ã¦ãã¾ããããã®å®ç¾©ã¯ãããã¾ãæå³ããªãã®ã§æ¶ãã¾ãã
@@ -848,24 +875,33 @@
% \end{macrocode}
% \end{macro}
%
-% ãã515ãã®è¨å·ã¨æ°åã®éã«ååã¢ããå
¥ããªãããã«ãã¾ãã
+% ã¢ã¹ãã¼ã® \texttt{kinsoku.dtx} ã§ã¯ãâããâããâãåå¾ã®ããã«ãã£ã5000ã«
+% ãªã£ã¦ããã®ã§ï¼\texttt{jsclasses.dtx} ã§ã¯ããã 10000 ã«è£æ£ãã¦ãã¾ããã
+% ãããï¼Lua\TeX-jaã§ã¯æåãããããã®ãã©ã¡ã¼ã¿ã¯ 10000 ãªã®ã§ï¼
+% ãã¯ãè£æ£ããå¿
è¦ã¯ããã¾ããã
+%
+% ã\TeXï¼ããã515ãã®è¨å·ã¨æ°åã®éã«ååã¢ããå
¥ããªãããã«ãã¾ãã
%
% \begin{macrocode}
-\ltjsetparameter{jaxspmode={`ã,2}}
+\ltjsetparameter{jaxspmode={`ï¼,2}}
+\ltjsetparameter{jaxspmode={`ã,1}}
% \end{macrocode}
%
% ãCãC++ã§ã¯â¦â¦ãã¨æ¸ãã¨ï¼C++ã®ç´å¾ã«ååã¢ããå
¥ããªãã®ã§ãã©ã³ã¹ãæªããªãã¾ãã
-% ååã¢ããå
¥ãããã«ãã¾ããã\%ã®ä¸¡å´ãåãã§ãã
+% ååã¢ããå
¥ãããã«ãã¾ããã\% ã®ä¸¡å´ãåãã§ãã
%
% \begin{macrocode}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
% \end{macrocode}
%
+% \texttt{jsclasses.dtx} ã§ã¯80ãffã®æåã® |\xspcode| ãå
¨ã¦3ã«ãã¦ãã¾ãããï¼
+% Lua\TeX-jaã§ã¯åæ§ã®å
容ãæåããè¨å®ããã¦ãã¾ãã®ã§ï¼å¯¾å¿ããé¨åã¯åé¤ã
+%
% \begin{macro}{\@}
%
-% \LaTeX ã® |\def\@{\spacefactor\@m}| ã¨ããå®ç¾©ï¼|\@m| ã¯1000ï¼
-% ã§ã¯ |I watch TV\@.| ã¨æ¸ãã¨Vã¨ããªãªãã®ãã¢ã«ã¼ãã³ã°ãå¹ããªããªãã¾ãã
+% 欧æã¨ããã°ï¼\LaTeX ã® |\def\@{\spacefactor\@m}| ã¨ããå®ç¾©ï¼|\@m| ã¯1000ï¼
+% ã§ã¯ |I watch TV\@.| ã¨æ¸ã㨠V ã¨ããªãªãã®ãã¢ã«ã¼ãã³ã°ãå¹ããªããªãã¾ãã
% ããã§ï¼æ¬¡ã®ãããªå®ç¾©ã«ç´ãï¼|I watch TV.\@| ã¨æ¸ããã¨ã«ãã¾ãã
%
% \begin{macrocode}
@@ -918,7 +954,11 @@
%
% |\parindent| ã«ã¤ãã¦ã¯ï¼0ï¼ä»¥ä¸ï¼ã§ãªããã°å
¨è§å¹
ï¼|1\zw|ï¼ã«ç´ãã¾ãã
%
-% [2008-02-18] |english| ãªãã·ã§ã³ã§ |\parindent| ã1emã«ãã¾ããã
+% [2008-02-18] |english| ãªãã·ã§ã³ã§ |\parindent| ã 1em ã«ãã¾ããã
+%
+% [2014-05-14 LTJ] |\ltjsetparameter|ã®å®è¡ã¯æéããããã®ã§ï¼
+% |\ltjsetkanjiskip| 㨠|\ltjsetxkanjiskip|ï¼ä¸¡è
ã¨ãï¼
+% å®è¡åã«ã¯ |\ltj@setpar@global| ã®å®è¡ãå¿
è¦ï¼ã«ãã¾ããï¼
%
% \begin{macrocode}
\def\@setfontsize#1#2#3{%
@@ -934,9 +974,12 @@
\parindent=1\zw
\fi
\fi
- \ltjsetparameter{kanjiskip={0\zw plus .1\zw minus .01\zw}}
- \if@slide \ltjsetparameter{xkanjiskip={0.1em}} \else
- \ltjsetparameter{xkanjiskip={0.25em plus 0.15em minus 0.06em}}
+ \ltj@setpar@global
+ \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
\fi}
% \end{macrocode}
% \end{macro}
@@ -998,7 +1041,7 @@
% å
¬ç§°10ãã¤ã³ãã®åæãã©ã³ããç´9.25ãã¤ã³ã
% ï¼ã¢ã¹ãã¼ã®ãã®ã®0.961åï¼ã§ãããã¨ãããï¼
% è¡éããããªããã£ããã¨ããã¨æãã¾ãã
-% å®éï¼$16/9.25 \approx 1.73$ã§ããï¼
+% å®éï¼$16/9.25 \approx 1.73$ ã§ããï¼
% åæã®æ¨å¥¨å¤ã®ä¸ã¤ãäºåååãï¼1.75ï¼
% ã«è¿ã¥ãã¾ããã
%
@@ -1049,7 +1092,7 @@
% \begin{macro}{\Chs}
%
% åºæºã¨ãªãé·ãã®è¨å®ããã¾ãã
-% \texttt{lltjfont.dtx}ã§å®£è¨ããã¦ãã
+% \texttt{lltjfont.sty}ã§å®£è¨ããã¦ãã
% ãã©ã¡ã¼ã¿ã«å®éã®å¤ãè¨å®ãã¾ãã
% ãã¨ãã° |\Cwd| 㯠|\normalfont| ã®å
¨è§å¹
ï¼|1\zw|ï¼ã§ãã
%
@@ -1071,10 +1114,10 @@
%
% |\small| ã |\normalsize| ã¨åæ§ã«è¨å®ãã¾ãã
% è¡éãã¯ï¼|\normalsize| ã16ãã¤ã³ããªãï¼
-% å²åããããã°$16 \times 0.9 = 14.4$ãã¤ã³ãã«ãªãã¾ããï¼
+% å²åããããã° $16 \times 0.9 = 14.4$ ãã¤ã³ãã«ãªãã¾ããï¼
% |\small| ã®ä½¿ããæ¹ãèãã¦ï¼ããã§ã¯åæ13ãã¤ã³ãï¼
% 欧æ11ãã¤ã³ãã¨ãã¾ãã
-% ã¾ãï¼|\topsep| 㨠|\parsep| ã¯ï¼å
ã¯ãããã$4 \pm 2$ï¼$2 \pm 1$
+% ã¾ãï¼|\topsep| 㨠|\parsep| ã¯ï¼å
ã¯ãããã $4 \pm 2$ï¼$2 \pm 1$
% ãã¤ã³ãã§ãããï¼ããã§ã¯ã¼ãï¼|\z@|ï¼ã«ãã¾ããã
%
% \begin{macrocode}
@@ -1227,7 +1270,7 @@
% ä¸ä¸ã®è¡ã®æåã |\lineskiplimit| ããæ¥è¿ãããï¼
% |\lineskip| ããè¿ã¥ããªãããã«ãã¾ãã
% å
ã¯0ptã§ããã1ptã«å¤æ´ãã¾ããã
-% \texttt{normal...}ã®ä»ããæ¹ã¯ä¿åç¨ã§ãã
+% \texttt{normal...} ã®ä»ããæ¹ã¯ä¿åç¨ã§ãã
%
% \begin{macrocode}
\setlength\lineskip{1\p@}
@@ -1260,7 +1303,7 @@
% \begin{macro}{\parindent}
%
% |\parskip| ã¯æ®µè½éã®è¿½å ã¹ãã¼ã¹ã§ãã
-% å
ã¯0pt plus 1ptã«ãªã£ã¦ãã¾ãããï¼ããã§ã¯ã¼ãã«ãã¾ããã
+% å
㯠0pt plus 1pt ã«ãªã£ã¦ãã¾ãããï¼ããã§ã¯ã¼ãã«ãã¾ããã
% |\parindent| ã¯æ®µè½ã®å
é ã®åä¸ãå¹
ã§ãã
%
% \begin{macrocode}
@@ -1293,7 +1336,7 @@
%
% \begin{macro}{\interlinepenalty}
%
-% 段è½ä¸ã®æ¹ãã¼ã¸ã®ããã«ãã£ã§ããããã©ã«ãã¯0ã§ãã
+% 段è½ä¸ã®æ¹ãã¼ã¸ã®ããã«ãã£ã§ããããã©ã«ã㯠0 ã§ãã
%
% \begin{macrocode}
% \interlinepenalty 0
@@ -1318,7 +1361,7 @@
% \begin{macro}{\topskip}
%
% |\topskip| ã¯æ¬æé åä¸ç«¯ã¨æ¬æ1è¡ç®ã®ãã¼ã¹ã©ã¤ã³ã¨ã®è·é¢ã§ãã
-% ãã¾ãããããã®å¤ã«ããã¨ï¼æ¬æä¸ã«$\int$ã®ãããªé«ãæåã
+% ãã¾ãããããã®å¤ã«ããã¨ï¼æ¬æä¸ã« $\int$ ã®ãããªé«ãæåã
% å
¥ã£ãã¨ãã«1è¡ç®ã®ãã¼ã¹ã©ã¤ã³ãä»ã®ãã¼ã¸ããä¸ãã£ã¦ãã¾ãã¾ãã
% ããã§ã¯æ¬æã®å
¬ç§°ãã©ã³ããµã¤ãºï¼10ptï¼ã«ãã¾ãã
%
@@ -1344,8 +1387,8 @@
% \begin{macro}{\footskip}
%
% |\footskip| ã¯æ¬æé åä¸ç«¯ã¨ããã¿ä¸ç«¯ã¨ã®è·é¢ã§ãã
-% æ¨æºã¯ã©ã¹ãã¡ã¤ã«ã§ã¯ï¼bookã§0.35inï¼ç´8.89mmï¼ï¼
-% book以å¤ã§30ptï¼ç´10.54mmï¼ã¨ãªã£ã¦ãã¾ãããï¼
+% æ¨æºã¯ã©ã¹ãã¡ã¤ã«ã§ã¯ï¼book ã§0.35inï¼ç´8.89mmï¼ï¼
+% book 以å¤ã§30ptï¼ç´10.54mmï¼ã¨ãªã£ã¦ãã¾ãããï¼
% ããã§ã¯A4å¤ã®ã¨ãã¡ããã©1cmã¨ãªãããã«ï¼
% |\paperheight| ã®0.03367åï¼æå° |\baselineskip|ï¼ã¨ãã¾ããã
% æ¸ç±ã«ã¤ãã¦ã¯ï¼ããã¿ã¯ä½¿ããªããã¨ã«ãã¦ï¼ã¼ãã«ãã¾ããã
@@ -1378,9 +1421,9 @@
% \begin{macro}{\headsep}
%
% |\headsep| ã¯ãããä¸ç«¯ã¨æ¬æé åä¸ç«¯ã¨ã®è·é¢ã§ãã
-% å
ã¯bookã§18ptï¼ç´6.33mmï¼ï¼
+% å
㯠book ã§18ptï¼ç´6.33mmï¼ï¼
% ãã以å¤ã§25ptï¼ç´8.79mmï¼ã«ãªã£ã¦ãã¾ããã
-% ããã§ã¯article㯠|\footskip| $-$ |\topskip| ã¨ãã¾ããã
+% ããã§ã¯ article 㯠|\footskip| $-$ |\topskip| ã¨ãã¾ããã
%
% \begin{macrocode}
%<*article>
@@ -1438,10 +1481,10 @@
\newdimen\fullwidth
% \end{macrocode}
%
-% ãã® |\fullwidth| ã¯articleã§ã¯ç´å¹
|\paperwidth|ã®0.76åãè¶
ããªã
+% ãã® |\fullwidth| 㯠article ã§ã¯ç´å¹
|\paperwidth|ã®0.76åãè¶
ããªã
% å
¨è§å¹
ã®æ´æ°åï¼äºæ®µçµã§ã¯å
¨è§å¹
ã®å¶æ°åï¼ã«ãã¾ãã0.76åã¨ããæ°å¤ã¯
% A4縦置ãã®å ´åã«ç´å¹
ããç´2ã¤ã³ããå¼ããå¤ã«ãªãããã«é¸ã³ã¾ããã
-% bookã§ã¯ç´å¹
ãã36ããªãå¼ããå¤ã«ãã¾ããã
+% book ã§ã¯ç´å¹
ãã36ããªãå¼ããå¤ã«ãã¾ããã
%
% \begin{macro}{\textwidth}
%
@@ -1558,7 +1601,7 @@
% ã¯ãã³ãã®å
å´ã« |1in| ã®ã¹ãã¼ã¹ï¼|1truein| ã§ã¯ãªãï¼ãæ¿å
¥ããã®ã§ï¼
% å ´ååããã¦ãã¾ãã
%
-% [2011-10-03] Lua\TeX{} (pdf\TeXï¼) ã§ã¯ |1truein| ã§ã¯ãªã
+% [2011-10-03 LTJ] Lua\TeX{} (pdf\TeXï¼) ã§ã¯ |1truein| ã§ã¯ãªã
% |1in| ã«ãªãããã§ãã
%
% \begin{macrocode}
@@ -1603,7 +1646,7 @@
% [2003-06-26] |\headheight| ã |\topskip| ã«ç´ãã¾ããã
% 以åã¯ãã®äºã¤ã¯å¤ãåãã§ãã£ãã®ã§ï¼å¤åã¯ãªãã¯ãã§ãã
%
-% [2011-10-03] ããã |\oddsidemargin| ã®ã¨ãã¨åæ§ã« |-\inv@mag in| ã§ã¯ãªã
+% [2011-10-03 LTJ] ããã |\oddsidemargin| ã®ã¨ãã¨åæ§ã« |-\inv@mag in| ã§ã¯ãªã
% |-1in| ã«ãã¾ãã
%
% \begin{macrocode}
@@ -1639,7 +1682,7 @@
% \begin{macro}{\footins}
%
% |\skip\footins| ã¯æ¬æã®æçµè¡ã¨æåã®è注ã¨ã®éã®è·é¢ã§ãã
-% æ¨æºã®10ãã¤ã³ãã¯ã©ã¹ã§ã¯9 plus 4 minus 2ãã¤ã³ãã«ãªã£ã¦ãã¾ããï¼
+% æ¨æºã®10ãã¤ã³ãã¯ã©ã¹ã§ã¯ 9 plus 4 minus 2 ãã¤ã³ãã«ãªã£ã¦ãã¾ããï¼
% åæã®è¡éããèãã¦ããã¡ãã£ã¨å¤§ãããã¾ãã
%
% \begin{macrocode}
@@ -1668,7 +1711,7 @@
% \begin{macro}{\topfraction}
%
% æ¬æãã¼ã¸ä¸é¨ã®ããã¼ããå æã§ããæ大ã®å²åã§ãã
-% ããã¼ããå
¥ããããããã«ï¼å
ã®å¤0.7ã0.8 [2003-08-23: 0.85]ã«å¤ãã¦ããã¾ãã
+% ããã¼ããå
¥ããããããã«ï¼å
ã®å¤ 0.7 ã 0.8 [2003-08-23: 0.85] ã«å¤ãã¦ããã¾ãã
%
% \begin{macrocode}
\renewcommand{\topfraction}{.85}
@@ -1688,7 +1731,7 @@
%
% \begin{macro}{\bottomfraction}
%
-% æ¬æãã¼ã¸ä¸é¨ã®ããã¼ããå æã§ããæ大ã®å²åã§ããå
ã¯0.3ã§ããã
+% æ¬æãã¼ã¸ä¸é¨ã®ããã¼ããå æã§ããæ大ã®å²åã§ããå
㯠0.3 ã§ããã
%
% \begin{macrocode}
\renewcommand{\bottomfraction}{.8}
@@ -1709,7 +1752,7 @@
% \begin{macro}{\textfraction}
%
% æ¬æãã¼ã¸ã«æä½éå
¥ããªããã°ãªããªãæ¬æã®å²åã§ãã
-% ããã¼ããå
¥ããããããã«å
ã®0.2ã0.1ã«å¤ãã¾ããã
+% ããã¼ããå
¥ããããããã«å
ã® 0.2 ã 0.1 ã«å¤ãã¾ããã
%
% \begin{macrocode}
\renewcommand{\textfraction}{.1}
@@ -1719,7 +1762,7 @@
% \begin{macro}{\floatpagefraction}
%
% ããã¼ãã ãã®ãã¼ã¸ã§ã®ããã¼ãã®æå°å²åã§ãã
-% ããã0.5ã0.8ã«å¤ãã¦ããã¾ãã
+% ããã 0.5 ã 0.8 ã«å¤ãã¦ããã¾ãã
%
% \begin{macrocode}
\renewcommand{\floatpagefraction}{.8}
@@ -1742,7 +1785,7 @@
%
% äºæ®µçµã®ã¨ãæ¬æãã¼ã¸ä¸é¨ã«åºåã§ãã
% 段æãããã¼ããå ãããæ大ã®å²åã§ãã
-% 0.7ã0.8ã«å¤ãã¦ããã¾ãã
+% 0.7 ã 0.8 ã«å¤ãã¦ããã¾ãã
%
% \begin{macrocode}
\renewcommand{\dbltopfraction}{.8}
@@ -1753,7 +1796,7 @@
%
% äºæ®µçµã®ã¨ãããã¼ãã ãã®ãã¼ã¸ã«å
¥ãã¹ã
% 段æãããã¼ãã®æå°å²åã§ãã
-% 0.5ã0.8ã«å¤ãã¦ããã¾ãã
+% 0.5 ã 0.8 ã«å¤ãã¦ããã¾ãã
%
% \begin{macrocode}
\renewcommand{\dblfloatpagefraction}{.8}
@@ -1827,7 +1870,7 @@
% ãã¼ã¸ã¹ã¿ã¤ã«ã¨ãã¦ï¼\LaTeXe ï¼æ¬§æçï¼ã®æ¨æºã¯ã©ã¹
% ã§ã¯ |empty|ï¼|plain|ï¼|headings|ï¼|myheadings| ãããã¾ãã
% ãã®ãã¡ |empty|ï¼|plain| ã¹ã¿ã¤ã«ã¯\LaTeXe æ¬ä½
-% ã§å®ç¾©ããã¦ãã¾ãã
+% ã§å®ç¾©ããã¦ãã¾ãã
%
% ã¢ã¹ãã¼ã®ã¯ã©ã¹ãã¡ã¤ã«ã§ã¯ |headnombre|ï¼|footnombre|ï¼
% |bothstyle|ï¼|jpl@in| ã追å ããã¦ãã¾ããï¼
@@ -1928,7 +1971,7 @@
% |headings| ã¹ã¿ã¤ã«ã¯ãããã«è¦åºãã¨ãã¼ã¸çªå·ãåºåãã¾ãã
% ããã§ã¯ãããã«ã¢ã³ãã¼ã©ã¤ã³ãå¼ãããã«ãã¦ã¿ã¾ããã
%
-% ã¾ãarticleã®å ´åã§ãã
+% ã¾ã article ã®å ´åã§ãã
%
% \begin{macrocode}
%<*article|kiyou>
@@ -1964,10 +2007,13 @@
%
% \end{macrocode}
%
-% 次ã¯bookã®å ´åã§ãã
+% 次㯠book ã®å ´åã§ãã
+% [2011-05-10] ãã£ã½æ好家ãã [qa:6370] ã®ããããåãè¾¼ã¾ãã¦ããã ãã¾ãã
+% ï¼åè¦ãã [qa:55896] ã®ãææãããã¨ããããã¾ãï¼ã
%
% \begin{macrocode}
%<*book>
+\newif\if@omit@number
\def\ps@headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
@@ -1982,7 +2028,9 @@
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
\if@mainmatter
- \@chapapp\thechapter\@chappos\hskip1\zw
+ \if@omit@number\else
+ \@chapapp\thechapter\@chappos\hskip1\zw
+ \fi
\fi
\fi
##1}{}}%
@@ -2398,7 +2446,7 @@
% äºã¤æ¿å
¥ãã |\everyparhook| ã®ãã¡å¾è
ã |\paragraph| é¡ã®å¾ã§2åå®è¡ããï¼
% ãã以éã¯åè
ãå®è¡ããã¾ãã
%
-% [2011-10-05] Lua\TeX-jaã§ã¯|\everyparhook|ã¯ä¸è¦ãªã®ã§åé¤ã
+% [2011-10-05 LTJ] Lua\TeX-jaã§ã¯ |\everyparhook| ã¯ä¸è¦ãªã®ã§åé¤ã
%
% \begin{macrocode}
\def\@xsect#1{%
@@ -2494,7 +2542,7 @@
%
% è¦åºãçªå·ã®ã«ã¦ã³ã¿ã§ãã
% |\newcounter| ã®ç¬¬1å¼æ°ãæ°ãã«ä½ãã«ã¦ã³ã¿ã§ãã
-% ããã¯ç¬¬2å¼æ°ãå¢å ãããã³ã«0ã«æ»ããã¾ãã
+% ããã¯ç¬¬2å¼æ°ãå¢å ãããã³ã« 0 ã«æ»ããã¾ãã
% 第2å¼æ°ã¯å®ç¾©æ¸ã¿ã®ã«ã¦ã³ã¿ã§ãã
%
% \begin{macrocode}
@@ -2702,7 +2750,7 @@
% é¨ã®è¦åºããåºåãã¾ãã
% |\bfseries| ã |\headfont| ã«å¤ãã¾ããã
%
-% |book| ã¯ã©ã¹ä»¥å¤ã§ã¯ |secnumdepth| ã$-1$ãã大ããã¨ã
+% |book| ã¯ã©ã¹ä»¥å¤ã§ã¯ |secnumdepth| ã $-1$ ãã大ããã¨ã
% é¨çªå·ãä»ãã¾ãã
%
% \begin{macrocode}
@@ -2732,7 +2780,7 @@
%!book>
% \end{macrocode}
%
-% |book| ã¯ã©ã¹ã§ã¯ |secnumdepth| ã$-2$ãã大ããã¨ãé¨çªå·ãä»ãã¾ãã
+% |book| ã¯ã©ã¹ã§ã¯ |secnumdepth| ã $-2$ ãã大ããã¨ãé¨çªå·ãä»ãã¾ãã
%
% \begin{macrocode}
%<*book>
@@ -2811,7 +2859,7 @@
%
% ç« ã®æåã®ãã¼ã¸ã¹ã¿ã¤ã«ã¯ï¼å
¨ä½ã |empty| ã§ãªããã° |plain| ã«
% ãã¾ãã
-% ã¾ãï¼|\@topnum| ã0ã«ãã¦ï¼
+% ã¾ãï¼|\@topnum| ã 0 ã«ãã¦ï¼
% ç« è¦åºãã®ä¸ã«å³ã表ãæ¥ãªãããã«ãã¾ãã
%
% \begin{macrocode}
@@ -2821,7 +2869,9 @@
\plainifnotempty % å
: \thispagestyle{plain}
\global\@topnum\z@
\if@english \@afterindentfalse \else \@afterindenttrue \fi
- \secdef\@chapter\@schapter}
+ \secdef
+ {\@omit@numberfalse\@chapter}%
+ {\@omit@numbertrue\@schapter}}
% \end{macrocode}
% \end{macro}
%
@@ -2838,7 +2888,8 @@
\typeout{\@chapapp\thechapter\@chappos}%
\addcontentsline{toc}{chapter}%
{\protect\numberline
- {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
+ % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
+ {\@chapapp\thechapter\@chappos}%
#1}%
\else\addcontentsline{toc}{chapter}{#1}\fi
\else
@@ -3009,13 +3060,13 @@
%
% \subsection{ãªã¹ãç°å¢}
%
-% 第$k$ã¬ãã«ã®ãªã¹ãã®åæåãããã®ã |\@list|$k$ã§ã
+% 第 $k$ ã¬ãã«ã®ãªã¹ãã®åæåãããã®ã |\@list|$k$ ã§ã
% ï¼$k = \mathtt{i}, \mathtt{ii}, \mathtt{iii}, \mathtt{iv}$ï¼ã
-% |\@list|$k$㯠|\leftmargin| ã |\leftmargin|$k$ã«è¨å®ãã¾ãã
+% |\@list|$k$ 㯠|\leftmargin| ã |\leftmargin|$k$ ã«è¨å®ãã¾ãã
%
% \begin{macro}{\leftmargini}
%
-% äºæ®µçµã§ããããªããã«å¿ãã¦ãããã2emï¼2.5emã§ãããï¼
+% äºæ®µçµã§ããããªããã«å¿ãã¦ãããã 2emï¼2.5em ã§ãããï¼
% ããã§ã¯å
¨è§å¹
ã®2åã«ãã¾ããã
%
% [2002-05-11] |3\zw| ã«å¤æ´ãã¾ããã
@@ -3042,7 +3093,7 @@
% \begin{macro}{\leftmarginvi}
%
% |ii|ï¼|iii|ï¼|iv| 㯠|\labelsep| ã¨
-% ãããã`(m)'ï¼`vii.'ï¼`M.'ã®å¹
ã¨ã®åãã大ãããã
+% ãããã `(m)'ï¼`vii.'ï¼`M.' ã®å¹
ã¨ã®åãã大ãããã
% ãã¨ã«ãªã£ã¦ãã¾ããããã§ã¯å
¨è§å¹
ã®æ´æ°åã«ä¸¸ãã¾ããã
%
% \begin{macrocode}
@@ -3086,7 +3137,7 @@
% ãªã¹ãç°å¢ã®åã«ç©ºè¡ãããå ´åï¼
% |\parskip| 㨠|\topsep| ã« |\partopsep| ã
% å ããå¤ã ã縦æ¹åã®ç©ºç½ãã§ãã¾ãã
-% 0ã«æ¹å¤ãã¾ããã
+% 0 ã«æ¹å¤ãã¾ããã
%
% \begin{macrocode}
\setlength\partopsep{\z@} % {2\p@ \@plus 1\p@ \@minus 1\p@}
@@ -3123,7 +3174,7 @@
% ãããã¬ãã«ã® |itemize|ï¼|enumerate| ç°å¢ã§ã ã
% æåã¨æå¾ã«è¡éãã®ååã®ç©ºããå
¥ãããã«ãªã£ã¦ãã¾ããã
%
-% [2004-09-27] |\topsep| ã®ã°ã«ã¼$_{-0.1}^{+0.2}$ |\baselineskip|
+% [2004-09-27] |\topsep| ã®ã°ã«ã¼ $_{-0.1}^{+0.2}$ |\baselineskip|
% ãæãåã£ã¦å¤ãã¾ããã
%
% \begin{macrocode}
@@ -3180,7 +3231,7 @@
% \paragraph{enumerateç°å¢}
%
% |enumerate| ç°å¢ã¯ã«ã¦ã³ã¿ |enumi|ï¼|enumii|ï¼|enumiii|ï¼
-% |enumiv| ã使ãã¾ãã|enum|$n$ã¯ç¬¬$n$ã¬ãã«ã®çªå·ã§ãã
+% |enumiv| ã使ãã¾ãã|enum|$n$ ã¯ç¬¬ $n$ ã¬ãã«ã®çªå·ã§ãã
%
% \begin{macro}{\theenumi}
% \begin{macro}{\theenumii}
@@ -3188,7 +3239,7 @@
% \begin{macro}{\theenumiv}
%
% åºåããçªå·ã®æ¸å¼ãè¨å®ãã¾ãã
-% ãããã¯\LaTeX æ¬ä½ï¼\texttt{ltlists.dtx}åç
§ï¼ã§å®ç¾©æ¸ã¿ã§ããï¼
+% ãããã¯\LaTeX æ¬ä½ï¼\texttt{ltlists.dtx} åç
§ï¼ã§å®ç¾©æ¸ã¿ã§ããï¼
% ããã§ã¯è¡¨ãæ¹ãå¤ãã¦ãã¾ãã
% |\@arabic|ï¼|\@alph|ï¼|\@roman|ï¼|\@Alph| ã¯ãããã
% ç®ç¨æ°åï¼å°æåã¢ã«ãã¡ãããï¼å°æåãã¼ãæ°åï¼å¤§æåã¢ã«ãã¡ããã
@@ -3232,7 +3283,7 @@
% \begin{macro}{\p@enumiii}
% \begin{macro}{\p@enumiv}
%
-% |\p@enum|$n$㯠|\ref| ã³ãã³ã㧠|enumerate| ç°å¢ã®ç¬¬$n$ã¬ãã«ã®
+% |\p@enum|$n$ 㯠|\ref| ã³ãã³ã㧠|enumerate| ç°å¢ã®ç¬¬ $n$ ã¬ãã«ã®
% é
ç®ãåç
§ãããã¨ãã®æ¸å¼ã§ãã
% ããã第2ã¬ãã«ã¯åæç¨ãã£ãã«ãã¾ããã
%
@@ -3251,7 +3302,7 @@
% \begin{macro}{\labelitemii}
% \begin{macro}{\labelitemiii}
% \begin{macro}{\labelitemiv}
-% |itemize| ç°å¢ã®ç¬¬$n$ã¬ãã«ã®ã©ãã«ãä½ãã³ãã³ãã§ãã
+% |itemize| ç°å¢ã®ç¬¬ $n$ ã¬ãã«ã®ã©ãã«ãä½ãã³ãã³ãã§ãã
% \begin{macrocode}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -3420,7 +3471,7 @@
% \begin{environment}{quotation}
%
% 段è½ã®é ã®åä¸ãéã1.5emãã |\parindent| ã«å¤ãã¾ããã
-% ã¾ãï¼å³ãã¼ã¸ã³ã0ã«ãã¾ããã
+% ã¾ãï¼å³ãã¼ã¸ã³ã 0 ã«ãã¾ããã
%
% \begin{macrocode}
\newenvironment{quotation}{%
@@ -3981,7 +4032,7 @@
%
% \begin{macro}{\@dotsep}
%
-% ç¹ã®ééã§ãï¼åä½muï¼ã
+% ç¹ã®ééã§ãï¼åä½ muï¼ã
%
% \begin{macro}{\c@tocdepth}
%
@@ -4007,9 +4058,18 @@
%
% ç®æ¬¡ãçæãã¾ãã
%
+% \begin{macro}{\js@tocl@width}
+%
+% [2013-12-30] |\prechaptername| ãªã©ããè¦ç©ãã£ãç®æ¬¡ã®ã©ãã«ã®é·ãã§ãã(by ts)
+%
% \begin{macrocode}
+\newdimen\js@tocl@width
\newcommand{\tableofcontents}{%
%<*book>
+ \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}%
+ \settowidth\@tempdima{\headfont\appendixname}%
+ \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi
+ \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi
\if@twocolumn
\@restonecoltrue\onecolumn
\else
@@ -4019,6 +4079,10 @@
\@mkboth{\contentsname}{}%
%
%<*!book>
+ \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\@tempdima{\headfont\appendixname}%
+ \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi
+ \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
%!book>
@@ -4026,7 +4090,7 @@
% \if@restonecol\twocolumn\fi
}
% \end{macrocode}
-% \end{macro}
+% \end{macro}\end{macro}
%
% \begin{macro}{\l@part}
%
@@ -4058,7 +4122,10 @@
%
% \begin{macro}{\l@chapter}
%
-% ç« ã®ç®æ¬¡ã§ãã|\@lnumwidth| ã|4.683\zw|ã«å¢ããã¾ããã
+% ç« ã®ç®æ¬¡ã§ãã|\@lnumwidth| ã |4.683\zw| ã«å¢ããã¾ããã
+%
+% [2013-12-30] |\@lnumwidth| ã |\js@tocl@width| ãã
+% 決ããããã«ãã¦ã¿ã¾ããã(by ts)
%
% \begin{macrocode}
%<*book>
@@ -4073,7 +4140,8 @@
\rightskip\@tocrmarg
\parfillskip-\rightskip
\leavevmode\headfont
- \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
+ % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
+ \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
@@ -4099,7 +4167,8 @@
\rightskip\@tocrmarg
\parfillskip-\rightskip
\leavevmode\headfont
- \setlength\@lnumwidth{4\zw}% å
1.5em [2003-03-02]
+ %\setlength\@lnumwidth{4\zw}% å
1.5em [2003-03-02]
+ \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
@@ -4111,8 +4180,12 @@
% |1\zw|ï¼|3.683\zw|ã«å¤ãã¾ããã
%
% \begin{macrocode}
-%\newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+% % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
% \end{macrocode}
+%
+% [2013-12-30] ä¸ã®ã¤ã³ãã³ã㯠|\js@tocl@width| ãã決ããããã«
+% ãã¾ããã(by ts)
+%
% \end{macro}
%
% \begin{macro}{\l@subsection}
@@ -4123,22 +4196,54 @@
% ããã«ä¸ä½ã¬ãã«ã®ç®æ¬¡é
ç®ã®ä½è£ã§ãã
% ãã¾ã使ã£ããã¨ãããã¾ããã®ã§ï¼è¦ä¿®æ£ããããã¾ããã
%
+% [2013-12-30] ããã |\js@tocl@width| ãã決ããããã«
+% ãã¦ã¿ã¾ããã(by ts)
+%
% \begin{macrocode}
%<*!book>
% \newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
-\newcommand*{\l@subsection} {\@dottedtocline{2}{1\zw}{3\zw}}
% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}}
-\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2\zw}{3\zw}}
% \newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
-\newcommand*{\l@paragraph} {\@dottedtocline{4}{3\zw}{3\zw}}
% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}}
-\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
+%
+% \newcommand*{\l@subsection} {\@dottedtocline{2}{1\zw}{3\zw}}
+% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{2\zw}{3\zw}}
+% \newcommand*{\l@paragraph} {\@dottedtocline{4}{3\zw}{3\zw}}
+% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
+%
+\newcommand*{\l@subsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima -1\zw
+ \@dottedtocline{2}{\@tempdima}{3\zw}}
+\newcommand*{\l@subsubsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 0\zw
+ \@dottedtocline{3}{\@tempdima}{4\zw}}
+\newcommand*{\l@paragraph}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 1\zw
+ \@dottedtocline{4}{\@tempdima}{5\zw}}
+\newcommand*{\l@subparagraph}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 2\zw
+ \@dottedtocline{5}{\@tempdima}{6\zw}}
%!book>
%<*book>
-\newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}}
-\newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
-\newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}}
-\newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}}
+% \newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}}
+% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
+% \newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}}
+% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}}
+\newcommand*{\l@section}{%
+ \@tempdima\js@tocl@width \advance\@tempdima -1\zw
+ \@dottedtocline{1}{\@tempdima}{3.683\zw}}
+\newcommand*{\l@subsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 2.683\zw
+ \@dottedtocline{2}{\@tempdima}{3.5\zw}}
+\newcommand*{\l@subsubsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 6.183\zw
+ \@dottedtocline{3}{\@tempdima}{4.5\zw}}
+\newcommand*{\l@paragraph}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 10.683\zw
+ \@dottedtocline{4}{\@tempdima}{5.5\zw}}
+\newcommand*{\l@subparagraph}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 16.183\zw
+ \@dottedtocline{5}{\@tempdima}{6.5\zw}}
%
% \end{macrocode}
% \end{macro}
@@ -4178,7 +4283,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
% \end{macrocode}
@@ -4253,7 +4358,7 @@
% \begin{macro}{\bibindent}
%
% ãªã¼ãã³ã¹ã¿ã¤ã«ã®åèæç®ã§ä½¿ãã¤ã³ãã³ãå¹
ã§ãã
-% å
ã¯1.5emã§ããã
+% å
㯠1.5em ã§ããã
%
% \begin{macrocode}
\newdimen\bibindent
@@ -4332,7 +4437,7 @@
% \begin{macro}{\@cite}
% \begin{macro}{\@citex}
%
-% æç®ã®çªå·ãåºåããé¨åã¯\texttt{ltbibl.dtx}ã§å®ç¾©ããã¦ãã¾ããï¼
+% æç®ã®çªå·ãåºåããé¨å㯠\texttt{ltbibl.dtx} ã§å®ç¾©ããã¦ãã¾ããï¼
% ã³ã³ãã¨ãã£ããåæãã©ã³ãã«ããã«ã¯æ¬¡ã®ããã«ãã¾ãã
% ã¨ããããã³ã¡ã³ãã¢ã¦ããã¦ããã¾ããã®ã§ï¼å¿
è¦ã«å¿ãã¦çããã¦ãã ããã
% ãã£ãã®åå¾ã«å
¥ãã°ã«ã¼ã |\inhibitglue| ã§åã£ã¦ãã¾ãã®ã§ï¼
@@ -4491,12 +4596,15 @@
%
% [2002-04-09] ã¤ã³ããªã¡ã³ãã®ä»æ¹ãå¤ããããæ¶ãã¾ããã
%
+% [2013-04-23] æ°ãã\pTeX ã§ã¯è注çªå·ã®ã¾ããã«ã¹ãã¼ã¹ãå
¥ãããããã¨ãé²ãããï¼
+% åå·ããã®ããã [qa:57090] ãåãè¾¼ã¿ã¾ããã
+%
+% [2013-05-14] plcore.ltx ã«å£ã£ãå½¢ã«æ¸ãç´ãã¾ããï¼Thanks: åå·ããï¼ã
+%
% \begin{macrocode}
-% \def\@makefnmark{\hbox{\@textsuperscript{\normalfont
-% \ifx\@thefnmark\@empty\else
-% \textasteriskcentered
-% \fi
-% \@thefnmark}}}
+\renewcommand\@makefnmark{\hbox{}\hbox{%
+ \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
% \end{macrocode}
% \end{macro}
%
@@ -4615,7 +4723,7 @@
%
% 段è½é ã®ãããã£ããªã©ãè¦ãã1ååä¸ãããå
¨è§1åä¸ãã«ç´ãã¾ãã
%
-% [2012-04-24] LuaTeX-jaã§ã¯JFMã«æ®µè½éå§æã®æ¬å¼§é¡ã®åä¸ãå¹
ãã³ã³ããã¼ã«
+% [2012-04-24 LTJ] LuaTeX-jaã§ã¯JFMã«æ®µè½éå§æã®æ¬å¼§é¡ã®åä¸ãå¹
ãã³ã³ããã¼ã«
% ããæ©è½ãããã¾ããï¼|\item| ç´å¾ã§ã¯ã©ãã«ç¨ã®ããã¯ã¹ã段è½å
é ã«ãªã
% ããï¼ãã¾ãåãã¾ããã§ããï¼å½¢ãå¤ãã¦å¾©æ´»ããã¾ãï¼
%
@@ -4729,7 +4837,7 @@
% \begin{macro}{\TeX}
% \begin{macro}{\LaTeX}
%
-% ãããã¯\texttt{ltlogos.dtx}ã§å®ç¾©ããã¦ãã¾ããï¼
+% ããã㯠\texttt{ltlogos.dtx} ã§å®ç¾©ããã¦ãã¾ããï¼
% TimesãHelveticaã§ãè¦æ ããããããã«è¥å¹²å¤æ´ãã¾ããã
%
% [2003-06-12] Palatinoãå ãã¾ããï¼è¦èª¿æ´ï¼ã
@@ -4857,7 +4965,7 @@
%
% |\LaTeXe| ã³ãã³ãã® |\mbox{\m@th ...| ã§å§ã¾ãæ°ããå®ç¾©ã§ã¯
% ç´å¾ã®åæã¨ã®éã« |xkanjiskip| ãå
¥ãã¾ãããã¾ãï¼
-% |mathptmx| ããã±ã¼ã¸ãªã©ã¨ä½µç¨ããã¨ï¼æå¾ã®$\varepsilon$ã
+% |mathptmx| ããã±ã¼ã¸ãªã©ã¨ä½µç¨ããã¨ï¼æå¾ã® $\varepsilon$ ã
% ä¸ããããã¦ãã¾ãã¾ãããã®ããï¼ã¡ãã£ã¨æãå ãã¾ããã
%
% \begin{macrocode}
@@ -4885,7 +4993,7 @@
%
% \begin{macro}{\AmSTeX}
%
-% \texttt{amstex.sty}ã§å®ç¾©ããã¦ãã¾ãã
+% \texttt{amstex.sty} ã§å®ç¾©ããã¦ãã¾ãã
%
% \begin{macrocode}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
@@ -4896,7 +5004,7 @@
% \begin{macro}{\BibTeX}
% \begin{macro}{\SliTeX}
%
-% ãããã¯\texttt{doc.dtx}ããåã£ããã®ã§ãã
+% ããã㯠\texttt{doc.dtx} ããåã£ããã®ã§ãã
% ãã ãï¼|\BibTeX| ã ãã¯ã¡ãã£ã¨ä¿®æ£ãã¾ããã
%
% \begin{macrocode}
@@ -4966,7 +5074,7 @@
% \begin{macrocode}
%\newcommand{\figurename}{\if@english Fig.~\else å³\fi}
%\newcommand{\figurename}{Fig.~}
-%\newcommand{\tablename}{\if@english Table.~\else 表\fi}
+%\newcommand{\tablename}{\if@english Table~\else 表\fi}
%\newcommand{\tablename}{Table~}
% \end{macrocode}
% \end{macro}
@@ -4975,7 +5083,8 @@
% \begin{macro}{\appendixname}
% \begin{macro}{\abstractname}
% \begin{macrocode}
-\newcommand{\appendixname}{\if@english Appendix~\else ä»é²\fi}
+% \newcommand{\appendixname}{\if@english Appendix~\else ä»é²\fi}
+\newcommand{\appendixname}{\if@english \else ä»é²\fi}
%\newcommand{\abstractname}{\if@english Abstract\else æ¦è¦\fi}
% \end{macrocode}
% \end{macro}
@@ -5042,7 +5151,8 @@
\renewcommand\kanjifamilydefault{\gtdefault}
\renewcommand\familydefault{\sfdefault}
\raggedright
- \ltjsetparameter{xkanjiskip={0.1em}}\relax
+ \ltj@setpar@global
+ \ltjsetxkanjiskip{0.1em}\relax
\fi
% \end{macrocode}
%