From fcd631537e8237c8d259af82841ded8d3a8b51b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Jun 2018 21:04:11 +0000 Subject: jlreq (17jun18) git-svn-id: svn://tug.org/texlive/trunk@48039 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/jlreq/jlreq-helpers.sty | 18 +- .../texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty | 9 +- Master/texmf-dist/tex/latex/jlreq/jlreq.cls | 191 ++++++++++++--------- 3 files changed, 127 insertions(+), 91 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty index 880622c4963..c8204d7e9db 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty @@ -184,6 +184,7 @@ % 簡易なkeyvalのパース. % \jlreq@parsekeyval*[family=jlreq@key]{ % *ありは\setkeys*を使う % {key}{\def\val{#1}} +% {key1,key2}{\def\val{#1}} % key1=valとkey2=valを受け付けるようになる % *{key}{\def\val{#1}} % デフォルト値を空文字列にする % {key}[choice1,choice2]{\def\valchoice{#1}} %}{parse対象} @@ -195,7 +196,7 @@ } \long\def\jlreq@helper@parsekeyval@@#1[#2]#3#4{% \begingroup - \def\jlreq@do{}% + \def\jlreq@do{}% \setkeysの結果処理がここに入れられる(よってループ内で利用不可) \jlreq@helper@parsekeyval@@@{#2}#3{\jlreq@endmark}% \setkeys#1{#2}{#4}% \expandafter\endgroup @@ -214,15 +215,24 @@ }% } \long\def\jlreq@helper@parsekeyval@@@choicekey#1#2[#3]#4{% - \define@choicekey{#1}{#2}{#3}{\eappto\jlreq@do{\unexpanded{#4}}}% + \@for\@tempa:=#2\do{% + \edef\jlreq@next{\unexpanded{\define@choicekey{#1}}{\expandonce{\@tempa}}}% + \jlreq@next{#3}{\eappto\jlreq@do{\unexpanded{#4}}}% + }% \jlreq@helper@parsekeyval@@@{#1}% } \long\def\jlreq@helper@parsekeyval@@@definekeywithdefault#1#2#3{% - \define@key{#1}{#2}[]{\eappto\jlreq@do{\unexpanded{#3}}}% + \@for\@tempa:=#2\do{% + \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}% + \jlreq@next[]{\eappto\jlreq@do{\unexpanded{#3}}}% + }% \jlreq@helper@parsekeyval@@@{#1}% } \long\def\jlreq@helper@parsekeyval@@@definekey#1#2#3{% - \define@key{#1}{#2}{\eappto\jlreq@do{\unexpanded{#3}}}% + \@for\@tempa:=#2\do{% + \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}% + \jlreq@next{\eappto\jlreq@do{\unexpanded{#3}}}% + }% \jlreq@helper@parsekeyval@@@{#1}% } diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty index 48f9bd51439..73d9bed7603 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty @@ -1,8 +1,13 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jlreq-trimmarks}[2018/05/19 jlreq-trimmarks] +\ProvidesPackage{jlreq-trimmarks}[2018/06/17 jlreq-trimmarks] \RequirePackage{xkeyval,etoolbox} \RequirePackage{jlreq-helpers} +% check \tombowdatetrue +\ifx\tombowdatetrue\@undefined + \PackageError{jlreq-trimmarks}{This package only works with pLaTeX, upLaTeX or LuaTeX-ja}{\@ehc} +\fi + \newcommand*{\jlreq@trimmarks@undeferr}[1]{\PackageError{jlreq-trimmarks}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}} \newcommand*{\jlreq@trimmarks@afterpkg@addtodeletecs}[1]{% \appto\jlreq@trimmarks@afterpkg@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@trimmarks@undeferr}}% @@ -126,7 +131,7 @@ {banner}{\tombowdatetrue} {digital}{\jlreq@trimmarks@digitaltrue} {digital*}{\jlreq@trimmarks@digitaltrue\jlreq@trimmarks@show@artboxtrue} - {no}{\tombowdatefalse\jlreq@trimmarks@showfalse\jlreq@trimmarks@digitafalse} + {no}{\tombowdatefalse\jlreq@trimmarks@showfalse\jlreq@trimmarks@digitalfalse} }[\PackageError{jlreq-trimmarks}{Unknown value `##1' in the option `show'}{\@ehc}] } } diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 241fa9d4d01..b717e3efbf7 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/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}[2018/05/19 jlreq] +\ProvidesClass{jlreq}[2018/06/17 jlreq] \RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen} \RequirePackage{jlreq-helpers} @@ -826,8 +826,10 @@ % \item後の行頭括弧のために仕込み. \jlreq@saveoriginalcs{\list} \jlreq@saveoriginalcs{\endlist} - \pretocmd{\list}{\jlreq@pushhook@postpar{\ltjfakeparbegin}}{}{} - \apptocmd{\endlist}{\jlreq@pophook@postpar}{}{} + \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を入れたりする命令を作る @@ -837,10 +839,13 @@ \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} + \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} + \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 @@ -850,26 +855,6 @@ \edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前 \AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}} \fi -\newcount\jlreq@count@listnest -\jlreq@count@listnest=0 -% 現在のeveryparへのhookを保存スタックに積んでからPushPostHookする. -% スタックに積まれたものは\jlreq@pophook@postparで復帰できる -\def\jlreq@pushhook@postpar#1{% - \advance\jlreq@count@listnest by 1 - \begingroup - \edef\jlreq@do{\unexpanded{\SavePostHook{par}}{\expandonce{\csname jlreq@save@posthook@par@\the\jlreq@count@listnest\endcsname}}}% - \expandafter\endgroup - \jlreq@do - \PushPostHook{par}{#1}% -} -\def\jlreq@pophook@postpar{% - \begingroup - \edef\jlreq@do{\unexpanded{\RestorePostHook{par}}{\expandonce{\csname jlreq@save@posthook@par@\the\jlreq@count@listnest\endcsname}}}% - \expandafter\endgroup - \jlreq@do - \expandafter\let\csname jlreq@save@posthook@par@\the\jlreq@count@listnest\endcsname=\@undefined - \advance\jlreq@count@listnest by -1 -} % 行頭の括弧は \jlreq@open@bracket@before@space \inhibitglue 「みたいにする. \ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{ @@ -893,44 +878,43 @@ \def\jlreq@yokokanjiencoding{JY2} \def\jlreq@tatekanjiencoding{JT2} \fi +\ifx l\jlreq@engine + \def\jlreq@yokokanjiencoding{JY3} + \def\jlreq@tatekanjiencoding{JT3} +\fi +\expandafter\let\csname \jlreq@yokokanjiencoding/mc/m/n/10\endcsname\relax +\expandafter\let\csname \jlreq@tatekanjiencoding/mc/m/n/10\endcsname\relax \jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize} \edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} \jlreq@aftercls@addtodeletecs{\jlreq@jafontscale} \ifx l\jlreq@engine - \def\jlreq@yokokanjiencoding{JY3} - \def\jlreq@tatekanjiencoding{JT3} - \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax - \expandafter\let\csname JT3/mc/m/n/10\endcsname\relax \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 - \expandafter\let\csname \jlreq@yokokanjiencoding/mc/m/n/10\endcsname\relax - \expandafter\let\csname \jlreq@tatekanjiencoding/mc/m/n/10\endcsname\relax \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 -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{it}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{sl}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{sc}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{sl}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{bx}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{bx}{sl}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{bx}{n}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{it}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{sl}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{sc}{<->ssub*mc/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{sl}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{bx}{it}{<->ssub*gt/m/n}{} -\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +\@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{% @@ -1855,11 +1839,19 @@ \dp\jlreq@tempboxa=\dimexpr\dp\jlreq@tempboxa + \ht\jlreq@tempboxa\relax \ht\jlreq@tempboxa=0pt \box\jlreq@tempboxa - \par \jlreq@ifempty{#4}{\ifodd\jlreq@currentpage\nobreak\fi}{\nobreak}% \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt\else\prevdepth=0pt\fi \jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}% -}} + \edef\jlreq@do{% + \unexpanded{\def\jlreq@parhook@gyodori}{% + \noexpand\parskip=\the\parskip + \unexpanded{\def\jlreq@parhook@gyodori{}}% + }% + \unexpanded{\parskip=0pt plus 1pt}% + }% +\expandafter}\jlreq@do} +\PushPostHook{par}{\jlreq@parhook@gyodori} +\def\jlreq@parhook@gyodori{} % 行取り情報をゲットだぜ % \jlreq@resultに{1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}を入れる @@ -1974,7 +1966,7 @@ } {format}{\edef\jlreq@format{\unexpanded{##1}}} {after_label_space}{\def\jlreq@after@label@space{##1}} - {second_heading_text_indent}{% + {second_heading_text_indent,heading_text_second_indent}{% \jlreq@parsecomma{##1}{% \jlreq@iffirsttoken{####1}{*}{% \jlreq@hangfalse @@ -2160,10 +2152,9 @@ % : 現在いくつ目の連続する見出しを処理しているかのカウンター \newcount\jlreq@BlockHeading@spaces@current@count \jlreq@BlockHeading@spaces@current@count=0 - -\def\jlreq@BlockHeading@spaces@current@sequence{}% - +\def\jlreq@BlockHeading@spaces@current@sequence{} \def\jlreq@BlockHeading@spaces@headingslist{} + \newcommand{\SetBlockHeadingSpaces}[1]{% \begingroup % 現段階の情報をクリアする @@ -2401,8 +2392,9 @@ } % {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し}{6 = ラベルフォーマット}{7 = ラベルありフォーマット}{8 = ラベルなしフォーマット} \long\def\jlreq@RuninHeading@start@@#1#2#3#4#5#6#7#8{% + \if@noskipsec\leavevmode\fi \begingroup - \def\jlreq@do{}% + \def\jlreq@do{\global\@noskipsectrue}% \ifnum0\jlreq@ifempty{#3}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0 \def\jlreq@tempa##1{#8}% \else @@ -2412,12 +2404,16 @@ \par \eappto\jlreq@do{% \noexpand\everypar{% - \unexpanded{\everypar{}}% - \unexpanded{{\setbox\jlreq@tempboxa\lastbox}}% - \noexpand\begingroup - \expandonce{\jlreq@tempa{#5}}% - \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{#3}{#6}{#4}% - \noexpand\endgroup + \noexpand\if@noskipsec + \unexpanded{\global\@noskipsecfalse}% + \unexpanded{{\setbox\jlreq@tempboxa\lastbox}}% + \noexpand\begingroup + \expandonce{\jlreq@tempa{#5}}% + \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{#3}{#6}{#4}% + \noexpand\endgroup + \noexpand\else + \unexpanded{\everypar{}}% + \noexpand\fi }% }% \expandafter\endgroup @@ -2882,6 +2878,36 @@ \jlreqsetup{footnote_indent=0pt}% (4.2.5.b) \fi +\newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}} +\jlreq@jlreqsetup@add{footnote_second_indent}{% + \if@tate\else + \ifthenelse{ + \( \lengthtest{0.99\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < 1.01\zw} \) \OR + \( \lengthtest{-1.01\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < -0.99\zw} \) + }{}{\jlreq@note{脚注が2行以上となった場合,脚注の2行目以下の字下げを1行目より,脚注の文字サイズの全角アキとするか,逆に,1行目の字下げを2行目より,脚注の文字サイズの全角アキとする (4.2.5.d).}} + \fi + \ifdim\dimexpr #1\relax<0pt + \def\jlreq@makefntext{} + \else + \def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}} + \fi + \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}% + \unexpanded{% + \addtolength{\leftskip}{\jlreq@footnoteindent}% + \parindent=1\zw + \noindent + \hskip-\glueexpr #1\relax + \jlreq@referencemark@format{\@thefnmark}% + \hskip\glueexpr 1\zw\relax + }##1% + } +} +\jlreqsetup{footnote_second_indent=1\zw} + +\jlreq@jlreqsetup@add{footnotetext_indent}{ + \ClassWarningNoLine{jlreq}{footnotetext_indent was removed} +} + \ifx l\jlreq@engine \fnfixbottomtrue \fi @@ -2998,20 +3024,6 @@ \jlreq@hook@postnote } -% 4.2.5.d -\newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}} -\jlreq@jlreqsetup@add{footnotetext_indent}{ - \ifthenelse{\equal{#1}{one}}{ - \long\def\jlreq@makefntext##1{\parindent 1\zw - \addtolength{\leftskip}{\dimexpr\jlreq@footnoteindent + 1\zw\relax}% 全体をインデント+1文字分下げる - \noindent\hskip\glueexpr-1\zw\relax\jlreq@referencemark@format{\@thefnmark}\hskip\glueexpr1\zw\relax##1}% 見出し出力と一文字分の空き - }{ - \long\def\jlreq@makefntext##1{\parindent 1\zw - \addtolength{\leftskip}{\jlreq@footnoteindent}% 全体をインデント - \noindent\hskip\glueexpr1\zw\relax\jlreq@referencemark@format{\@thefnmark}\hskip\glueexpr1\zw\relax##1}% 見出し出力と一文字分の空き - } -} -\jlreqsetup{footnotetext_indent=one} % 合印 \renewcommand*{\@makefnmark}{% \jlreq@ifydir{\jlreq@notemark{\@thefnmark}}{\hbox{\jlreq@notemark{\@thefnmark}}}% @@ -3098,7 +3110,7 @@ \parsep=0pt\relax \partopsep=0pt\relax \topsep=0pt\relax - \leftmargin=\dimexpr\linewidth - \jlreq@tempdima\relax + \leftmargin=\dimexpr\linewidth - \jlreq@tempdima + \jlreq@endnote@second@indent\relax \itemindent=0pt\relax \topsep=\jlreq@endnote@beforeafterspace }% @@ -3110,10 +3122,17 @@ } % 4.2.4.b \jlreq@endnote@indent=2\jlreq@mol -% 二行目以降を全角分下げる(4.2.4.d:TODO: 選択できるべき) -\newcommand{\@makeendtext}[1]{\parindent 1\jlreq@mol - \hskip\glueexpr-1\jlreq@mol\relax\csname\jlreq@endnotemarkname\endcsname\hskip\glueexpr1\zw\relax#1}% 見出し出力と一文字分の空き(4.2.4.c) -\def\@makeendmark{\@makefnmark} +\jlreq@jlreqsetup@add{endnote_second_indent}{ + \def\jlreq@endnote@second@indent{#1} + \ifthenelse{ + \( \lengthtest{0.99\zw < #1} \AND \lengthtest{#1 < 1.01\zw} \) \OR + \( \lengthtest{1.99\zw < #1} \AND \lengthtest{#1 < 2.01\zw} \) + }{}{\jlreq@note{後注が2行以上となった場合,後注の2行目以下の字下げは,1行目より,後注の文字サイズの2倍又は全角とする (4.2.4.d).}} +} +\jlreqsetup{endnote_second_indent=2\zw} +\newcommand{\@makeendtext}[1]{\parindent 1\zw + \hskip\glueexpr-\jlreq@endnote@second@indent\relax\csname\jlreq@endnotemarkname\endcsname\hskip\glueexpr1\zw\relax#1}% 見出し出力と一文字分の空き(4.2.4.c) +\let\@makeendmark=\@makefnmark % \theendnoteの出力を仕込む \apptocmd{\jlreq@hook@beforeheadings}{\jlreq@endnote@hook@beforeheadings{#1}}{}{} @@ -3226,7 +3245,7 @@ % thefootnote = \inhibitglue (...だと\inhibitglueが効かないので空白を挟む \long\def\@makesidetext#1{ \kern-1\zw\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1} \fi - \def\@makesidemark{\@makefnmark} + \let\@makesidemark=\@makefnmark }{% sidenote_type = symbol \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}} \def\sidenotemark#1{\jlreq@sidenotemark{#1}} @@ -3246,7 +3265,7 @@ \@sidenotetext{#2}% } \long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq@sidenotemarkname\endcsname}\hspace*{1\jlreq@mol}#1} - \def\@makesidemark{\@makefnmark} + \let\@makesidemark=\@makefnmark \apptocmd{\sidenote}{\jlreq@hook@postnote}{}{} \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{} @@ -4198,6 +4217,7 @@ } %.. abstract +\def\jlreq@parhook@abstract{} \ifthenelse{\equal{\jlreq@article@type}{book}}{}{% article,report \newbox\jlreq@abstractbox \newcommand*{\abstractname}{概要} @@ -4220,7 +4240,8 @@ \ifnum0\if@twocolumn\else1\fi\ifjlreq@preamble1\fi>0 \ifjlreq@preamble \ifx l\jlreq@engine\else - \jlreq@pushhook@postpar{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}% + \def\jlreq@parhook@abstract{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}% + \PushPostHook{par}{\jlreq@parhook@abstract}% \fi \fi % とりあえず全部ボックスに入れる. @@ -4275,7 +4296,7 @@ \fi \ifjlreq@preamble \ifx l\jlreq@engine\else - \jlreq@pophook@postpar + \def\jlreq@parhook@abstract{}% \fi \else \unvbox\jlreq@abstractbox -- cgit v1.2.3