diff options
author | Norbert Preining <norbert@preining.info> | 2019-09-25 03:00:48 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-09-25 03:00:48 +0000 |
commit | d232e1107d60e7689e706bee9705f26745ae8b9e (patch) | |
tree | f9ac3303fdb36c2eca1872286615c0931d952476 /language/japanese/jlreq | |
parent | 94c2e367c3690be2a3c715b4577c81200652ad81 (diff) |
CTAN sync 201909250300
Diffstat (limited to 'language/japanese/jlreq')
-rw-r--r-- | language/japanese/jlreq/README-ja.md | 4 | ||||
-rw-r--r-- | language/japanese/jlreq/README.md | 7 | ||||
-rw-r--r-- | language/japanese/jlreq/jlreq-helpers.sty | 6 | ||||
-rw-r--r-- | language/japanese/jlreq/jlreq-ja.pdf | bin | 353139 -> 353101 bytes | |||
-rw-r--r-- | language/japanese/jlreq/jlreq.cls | 311 | ||||
-rw-r--r-- | language/japanese/jlreq/jlreq.pdf | bin | 115733 -> 115749 bytes |
6 files changed, 174 insertions, 154 deletions
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md index 8425fdbbf1..f17d2669e5 100644 --- a/language/japanese/jlreq/README-ja.md +++ b/language/japanese/jlreq/README-ja.md @@ -443,6 +443,10 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - わずかな誤差で行数が減ってしまうのを防ぐために,`\textwidth`と`\textheight`を少しだけ増やした. - `\DeclarePageStyle`内の`running_head_ii`などの実装を変更. - バグ修正 +* 2019-09-24 + - `\@cite`と`\@biblabel`を再定義していたのをやめた. + - 別行見出しの前に`\allowbreak`を追加. + - バグ修正. -------------- diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md index 8d8b287954..f9191c9c58 100644 --- a/language/japanese/jlreq/README.md +++ b/language/japanese/jlreq/README.md @@ -112,10 +112,13 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - New regnal year. - Fixed bugs. * 2019-05-07 - - Added a small length to `\textwidth` and `\textheight'. + - Added a small length to `\textwidth` and `\textheight`. - Changed the implementation of `running_head_ii` etc. in `\DeclarePageStyle`. - Fixed bugs. - +* 2019-09-24 + - Deleted the (re-)definitions of `\@cite` and `\@biblabel`. + - Added `\allowbreak` before block headings. + - Fixed bugs. -------------- Noriyuki Abe diff --git a/language/japanese/jlreq/jlreq-helpers.sty b/language/japanese/jlreq/jlreq-helpers.sty index 5591c6261b..195121b521 100644 --- a/language/japanese/jlreq/jlreq-helpers.sty +++ b/language/japanese/jlreq/jlreq-helpers.sty @@ -60,7 +60,7 @@ % #1が\jlreq@endmarkか \long\def\jlreq@ifendmark#1{\jlreq@iffirsttoken{#1}{\jlreq@endmark}} -% 条件.\jlreq@if{ifnum\@count=1 \fi}{<TRUE>}{<FALSE>}みたいに使う +% 条件.\jlreq@if{\ifnum\@count=1 \fi}{<TRUE>}{<FALSE>}みたいに使う \def\jlreq@if@endmark{\jlreq@if@endmark} \def\jlreq@if#1{\jlreq@if@#1\jlreq@if@endmark} \@gobbletwo\if\if @@ -383,11 +383,11 @@ % オレオレラベル…… % \jlreq@reference@ref{ラベル名}{デフォルト値} -\def\jlreq@reference@ref#1{\jlreq@if{\expandafter\ifx\csname jlreq@reference@#1\endcsname\fi}{\csname jlreq@reference@#1\endcsname}} +\def\jlreq@reference@ref#1{\jlreq@if{\expandafter\unless\expandafter\ifx\csname jlreq@reference@#1\endcsname\relax\fi}{\csname jlreq@reference@#1\endcsname}} % \jlreq@reference@label{ラベル名}{値} \def\jlreq@reference@label#1#2{\protected@write\@auxout{}{\string\@newl@bel{jlreq@reference}{#1}{#2}}}% \def\jlreq@reference@immediate@write#1#2{\immediate\write\@auxout{\string\@newl@bel{jlreq@reference}{#1}{#2}}}% -\def\jlreq@reference@ifexist#1{\jlreq@if{\expandafter\ifx\csname jlreq@reference@#1\endcsname\fi}} +\def\jlreq@reference@ifexist#1{\jlreq@if{\expandafter\unless\expandafter\ifx\csname jlreq@reference@#1\endcsname\relax\fi}} % 自動生成されるラベル用の番号 \newcount\jlreq@reference@count diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf Binary files differindex 4febdac26e..1fb7dd2d55 100644 --- a/language/japanese/jlreq/jlreq-ja.pdf +++ b/language/japanese/jlreq/jlreq-ja.pdf diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls index 25758ea7ab..5935dd28c1 100644 --- a/language/japanese/jlreq/jlreq.cls +++ b/language/japanese/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %% % (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/) \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2019/05/07 jlreq] +\ProvidesClass{jlreq}[2019/09/24 jlreq] \RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen} \RequirePackage{jlreq-helpers} @@ -336,6 +336,10 @@ \else \RequirePackage[disablejfam]{luatexja} \fi + \RequirePackage{luatexja-adjust} + \ltjenableadjust[lineend=extended,priority=true] + \ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=10}} + \ltjsetparameter{shrink_priority={kanjiskip=0,xkanjiskip=-30}} \directlua{jlreq = {}} \fi @@ -588,7 +592,10 @@ \let\jlreq@divide=\jlreq@helper@divide \fi -%. 基本設定 +%. 文字関連設定 +% ダミー +\def\@ptsize{0} +%.. (x)kanjiskip \providecommand*{\jlreqkanjiskip}{0pt plus 0.25\zw minus 0pt} \providecommand*{\jlreqxkanjiskip}{0.25\zw plus 0.25\zw minus 0.125\zw} \ifx l\jlreq@engine @@ -599,7 +606,113 @@ \xkanjiskip=\jlreqxkanjiskip \fi -% 文字クラスのリスト(必要なものだけ) +% フォントサイズを設定 +\newdimen\jlreq@fontsize +\newdimen\jlreq@jafontsize +\ifx l\jlreq@engine + % Q,zw,zhが正しく扱われるようになる.\dimexprつきに展開される. + \def\jlreq@expand@optionfontsize#1{% + \dimexpr\directlua{ + local act = string.char(92) + local s = [[#1]] + s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax") + tex.print(s) + }\relax + }% +\else + \def\jlreq@expand@optionfontsize#1{\dimexpr#1\relax} +\fi +\jlreq@aftercls@addtodeletecs{\jlreq@expand@optionfontsize} +\ifx\jlreq@option@fontsize\@empty + \ifx\jlreq@option@jafontsize\@empty + \jlreq@fontsize=10pt + \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize + \else + \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} + \jlreq@divide{\jlreq@jafontsize}{\jlreq@option@jafontscale pt} + \jlreq@fontsize=\jlreq@resultdimen + \fi +\else + \setlength{\jlreq@fontsize}{\jlreq@expand@optionfontsize{\jlreq@option@fontsize}} + \ifx\jlreq@option@jafontsize\@empty + \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize + \else + \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} + \fi +\fi + +%.. JFM +\ifx l\jlreq@engine + \def\ltj@stdyokojfm{jlreq} + \def\ltj@stdtatejfm{jlreqv} + % この値は後でjfm-jlreq内で読む + \directlua{jlreq.open_bracket_pos = [[\jlreq@open@bracket@pos]]} + \ifjlreq@burasage\directlua{jlreq.burasage = true}\else\directlua{jlreq.burasage = false}\fi +\else + \def\jlreq@jfmname@prefix{} + \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix} + \ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi + \ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{\edef\jlreq@jfmname@prefix{\jlreq@jfmname@prefix z}}{} + \ifx u\jlreq@engine\edef\jlreq@jfmname@prefix{u\jlreq@jfmname@prefix}\fi + \edef\jlreq@jfmname{\jlreq@jfmname@prefix jlreq} % JFMの名前 + \edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前 + \jlreq@aftercls@addtodeletecs{\jlreq@jfmname} + \jlreq@aftercls@addtodeletecs{\jlreq@jfmnameg} + \AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}} +\fi + +% 行頭の括弧は \jlreq@open@bracket@before@space \inhibitglue 「みたいにする. +\ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{ + \def\jlreq@open@bracket@before@space{\hskip\glueexpr-.5\zw\relax} +}{ + \def\jlreq@open@bracket@before@space{} +} + +\ifx p\jlreq@engine + \def\jlreq@yokokanjiencoding{JY1} + \def\jlreq@tatekanjiencoding{JT1} +\fi +\ifx u\jlreq@engine + \def\jlreq@yokokanjiencoding{JY2} + \def\jlreq@tatekanjiencoding{JT2} +\fi +\ifx l\jlreq@engine + \def\jlreq@yokokanjiencoding{JY3} + \def\jlreq@tatekanjiencoding{JT3} +\fi +\jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize} +\edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} +\jlreq@aftercls@addtodeletecs{\jlreq@jafontscale} +\ifx l\jlreq@engine + \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreq;script=latn;-kern}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreq;script=latn;-kern}{} + \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreqv;script=latn;-kern}{} + \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreqv;script=latn;-kern}{} +\else + \DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname}{} + \DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg}{} + \DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname-v}{} + \DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg-v}{} +\fi +\@for\jlreq@encoding:=\jlreq@yokokanjiencoding,\jlreq@tatekanjiencoding\do{ + \@for\jlreq@shape:=n,it,sl,sc\do{ + \@for\jlreq@series:=m,b,bx,sb,c\do{ + \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ + \DeclareFontShape{\jlreq@encoding}{gt}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} + } + } + \@for\jlreq@series:=bx,b,sb\do{ + \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} + } + \@for\jlreq@series:=m,c\do{ + \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ + \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*mc/m/n}{} + } + } + } +} + +%.. 文字クラスのリスト % 開き括弧(文字クラス1) \edef\jlreq@charlist@openingbrackets{(〔[{〈《「『【‘“\ifx p\jlreq@engine\else ⦅〘〖«〝\fi} % 閉じ括弧(文字クラス2) @@ -629,6 +742,34 @@ % 片仮名(文字クラス16) \edef\jlreq@charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq@engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚ +%.. 行頭括弧調整 +\ifx l\jlreq@endgine + % \item後の行頭括弧のために仕込み. + \jlreq@saveoriginalcs{\list} + \jlreq@saveoriginalcs{\endlist} + \PushPostHook{par}{\jlreq@parhook@atbeginlist} + \pretocmd{\list}{\def\jlreq@parhook@atbeginlist{\ltjfakeparbegin}}{}{} + \apptocmd{\endlist}{\def\jlreq@parhook@atbeginlist{}}{}{} + \def\jlreq@parhook@atbeginlist{} +\else + % 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処. + % 行頭括弧に対して\inhibitglueを入れたりする命令を作る + % \jlreq@charlist@openingbracketsの各括弧に対して,\ifx\jlreq@nextchar 「1\fiみたいなのが並んだのを作る + \def\jlreq@tempa{} + \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}} + \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark + % JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる. + \ifthenelse{\equal{\jlreq@open@bracket@pos}{nibu_tentsuki}}{ + \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi} + }{% zenkakunibu_nibu,zenkaku_tentsuki + \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi} + } + % source special対策 + \def\jlreq@openbracket@hook{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@@\else\expandafter\jlreq@openbracket@hook@\fi} + \def\jlreq@openbracket@hook@@#1#2{#1{#2}\futurelet\jlreq@nextchar\jlreq@openbracket@hook} +\fi + +%.. 禁則処理 \ifx l\jlreq@engine \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\ltjsetparameter{postbreakpenalty={`#1,#2}}} \newcommand*{\jlreq@setprebreakpenalty@}[2]{\ltjsetparameter{prebreakpenalty={`#1,#2}}} @@ -793,41 +934,7 @@ \jlreq@setkcatcode{2F00,2FF0,3100,31A0,31C0,A830}{16} \fi -% フォントサイズを設定 -\newdimen\jlreq@fontsize -\newdimen\jlreq@jafontsize -\ifx l\jlreq@engine - % Q,zw,zhが正しく扱われるようになる.\dimexprつきに展開される. - \def\jlreq@expand@optionfontsize#1{% - \dimexpr\directlua{ - local act = string.char(92) - local s = [[#1]] - s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax") - tex.print(s) - }\relax - }% -\else - \def\jlreq@expand@optionfontsize#1{\dimexpr#1\relax} -\fi -\jlreq@aftercls@addtodeletecs{\jlreq@expand@optionfontsize} -\ifx\jlreq@option@fontsize\@empty - \ifx\jlreq@option@jafontsize\@empty - \jlreq@fontsize=10pt - \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize - \else - \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} - \jlreq@divide{\jlreq@jafontsize}{\jlreq@option@jafontscale pt} - \jlreq@fontsize=\jlreq@resultdimen - \fi -\else - \setlength{\jlreq@fontsize}{\jlreq@expand@optionfontsize{\jlreq@option@fontsize}} - \ifx\jlreq@option@jafontsize\@empty - \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize - \else - \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} - \fi -\fi -%. フォント +%.. フォント \RequirePackage{lmodern} %.. 古いフォントコマンド @@ -866,107 +973,6 @@ \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%.. 和文 -% ダミー -\def\@ptsize{0} -% JFMに関連する設定 -\ifx l\jlreq@engine - \def\ltj@stdyokojfm{jlreq} - \def\ltj@stdtatejfm{jlreqv} - % この値は後でjfm-jlreq内で読む - \directlua{jlreq.open_bracket_pos = [[\jlreq@open@bracket@pos]]} - \ifjlreq@burasage\directlua{jlreq.burasage = true}\else\directlua{jlreq.burasage = false}\fi - % \item後の行頭括弧のために仕込み. - \jlreq@saveoriginalcs{\list} - \jlreq@saveoriginalcs{\endlist} - \PushPostHook{par}{\jlreq@parhook@atbeginlist} - \pretocmd{\list}{\def\jlreq@parhook@atbeginlist{\ltjfakeparbegin}}{}{} - \apptocmd{\endlist}{\def\jlreq@parhook@atbeginlist{}}{}{} - \def\jlreq@parhook@atbeginlist{} -\else - % 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処. - % 行頭括弧に対して\inhibitglueを入れたりする命令を作る - % \jlreq@charlist@openingbracketsの各括弧に対して,\ifx\jlreq@nextchar 「1\fiみたいなのが並んだのを作る - \def\jlreq@tempa{} - \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}} - \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark - % JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる. - \ifthenelse{\equal{\jlreq@open@bracket@pos}{nibu_tentsuki}}{ - \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi} - }{% zenkakunibu_nibu,zenkaku_tentsuki - \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi} - } - % source special対策 - \def\jlreq@openbracket@hook{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@@\else\expandafter\jlreq@openbracket@hook@\fi} - \def\jlreq@openbracket@hook@@#1#2{#1{#2}\futurelet\jlreq@nextchar\jlreq@openbracket@hook} - \def\jlreq@jfmname@prefix{} - \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix} - \ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi - \ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{\edef\jlreq@jfmname@prefix{\jlreq@jfmname@prefix z}}{} - \ifx u\jlreq@engine\edef\jlreq@jfmname@prefix{u\jlreq@jfmname@prefix}\fi - \edef\jlreq@jfmname{\jlreq@jfmname@prefix jlreq} % JFMの名前 - \edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前 - \AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}} -\fi - -% 行頭の括弧は \jlreq@open@bracket@before@space \inhibitglue 「みたいにする. -\ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{ - \def\jlreq@open@bracket@before@space{\hskip\glueexpr-.5\zw\relax} -}{ - \def\jlreq@open@bracket@before@space{} -} - -\ifx l\jlreq@engine - \RequirePackage{luatexja-adjust} - \ltjenableadjust[lineend=extended,priority=true] - \ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=10}} - \ltjsetparameter{shrink_priority={kanjiskip=0,xkanjiskip=-30}} -\fi - -\ifx p\jlreq@engine - \def\jlreq@yokokanjiencoding{JY1} - \def\jlreq@tatekanjiencoding{JT1} -\fi -\ifx u\jlreq@engine - \def\jlreq@yokokanjiencoding{JY2} - \def\jlreq@tatekanjiencoding{JT2} -\fi -\ifx l\jlreq@engine - \def\jlreq@yokokanjiencoding{JY3} - \def\jlreq@tatekanjiencoding{JT3} -\fi -\jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize} -\edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} -\jlreq@aftercls@addtodeletecs{\jlreq@jafontscale} -\ifx l\jlreq@engine - \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreq;script=latn;-kern}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreq;script=latn;-kern}{} - \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreqv;script=latn;-kern}{} - \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreqv;script=latn;-kern}{} -\else - \DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname}{} - \DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg}{} - \DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname-v}{} - \DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg-v}{} -\fi -\@for\jlreq@encoding:=\jlreq@yokokanjiencoding,\jlreq@tatekanjiencoding\do{ - \@for\jlreq@shape:=n,it,sl,sc\do{ - \@for\jlreq@series:=m,b,bx,sb,c\do{ - \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ - \DeclareFontShape{\jlreq@encoding}{gt}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} - } - } - \@for\jlreq@series:=bx,b,sb\do{ - \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} - } - \@for\jlreq@series:=m,c\do{ - \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ - \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*mc/m/n}{} - } - } - } -} - % 和文ファミリと欧文ファミリの連動 \DeclareRobustCommand\rmfamily{% \not@math@alphabet\rmfamily\mathrm @@ -1047,6 +1053,8 @@ } \expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark + +%.. 文字サイズ変更命令の定義 % \baselineskipの計算 % いったん文字サイズを変更((u)platexの際にzh/zwをきちんとするため) \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@fontsize}% @@ -1071,8 +1079,6 @@ }{} \emergencystretch 3\jlreq@gol - -%.. 文字サイズ変更 \def\jlreq@setfontsizehook{} \jlreq@saveoriginalcs{\set@fontsize} \apptocmd{\set@fontsize}{\expandafter\def\expandafter\size@update\expandafter{\size@update\jlreq@setfontsizehook}}{}{} @@ -1703,7 +1709,7 @@ \if@noskipsec\leavevmode\fi % #5と#6は\parを含むかもしれないので引数渡しはしない(後の\@ifstarで詰まる) \edef\jlreq@BlockHeading@start@eachformat{\expandonce{\@firstoftwo#5}}% - \edef\jlreq@BlockHeading@start@format{\expandonce{\@secondoftwo#5}} + \edef\jlreq@BlockHeading@start@format{\expandonce{\@secondoftwo#5}}% \edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#6}}% \jlreq@BlockHeading@start@{#1}{#2}{#3}{#4}% } @@ -1746,6 +1752,7 @@ }% \def\@tempa##1##2##3{##1}% \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% + \noexpand\allowbreak \expandonce{\@tempa#4}% \expandonce{\jlreq@resulta}% \ifjlreq@tempa\unexpanded{% @@ -1765,7 +1772,6 @@ \ifodd\jlreq@BlockHeading@currentpage\nobreak\else\allowbreak\fi \fi }\else\noexpand\nobreak\fi - % 現状ここ↓は常に空 \expandonce{\@tempa#4}% }% \ifx\jlreq@BlockHeading@spaces@headingslist\@empty @@ -2945,7 +2951,18 @@ }% } \def\jlreq@hook@prenote{\inhibitglue} - \def\jlreq@hook@postnote{\inhibitglue} + % 後ろ側に始め括弧類(cl-01)が配置される場合を除いて,ベタ組(4.2.3,二つ目のc,三つ目のb). + \def\jlreq@hook@postnote{\futurelet\jlreq@nextchar\jlreq@postnote@checkopenbracket}% + \def\@tempa{} + \def\jlreq@do##1{\jlreq@ifendmark{##1}{}{\appto\@tempa{\ifx\jlreq@tempb##11\fi}\jlreq@do}} + \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark + \edef\jlreq@postnote@checkopenbracket{% + \unexpanded{% + \jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}% + \expandafter\let\expandafter\jlreq@tempb\jlreq@tempa + }% + \noexpand\jlreq@if{\noexpand\ifnum 0\expandonce{\@tempa}>0 \noexpand\fi}{}{\noexpand\inhibitglue}% + } }{% reference_mark=interlinear \def\jlreq@notemark##1{{% \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}% @@ -5148,10 +5165,6 @@ \jlreq@oldfontcommand@disable } \let\@openbib@code\@empty -\if@tate - \def\@cite#1#2{\jlreq@rensuji{[{#1\if@tempswa , #2\fi}]}} - \def\@biblabel#1{\jlreq@rensuji{[#1]}} -\fi %. 索引 \newif\ifjlreq@resttate @@ -5815,7 +5828,7 @@ \else \jlreqsetup{ appendix_counter = { - section = {value = 0, the = {\Alph{chapter}}}, + section = {value = 0, the = {\Alph{section}}}, subsection = {value = 0}, } } diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf Binary files differindex 49c5ee36b0..5eaebed0c6 100644 --- a/language/japanese/jlreq/jlreq.pdf +++ b/language/japanese/jlreq/jlreq.pdf |