%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-listings}[2015/01/07 Patch to listings for LuaTeX-ja]
+\ProvidesPackage{lltjp-listings}[2016/03/31 Patch to listings for LuaTeX-ja]
\RequirePackage{listings,luatexbase-cctb}
%%%%%%%%%%%%%%%% Japanese support
local cat_lp = luatexbase.catcodetables['latex-package']
local ubyte = unicode.utf8.byte
local spccmd = string.char(0x5C) .. 'ltj@lst@hss@normal'
- luatexja.lst = {}
- function luatexja.lst.althss(t)
+ luatexja.listings = {}
+ function luatexja.listings.althss(t)
t = ubyte(t)
if not (t>=0xE0100 and t<0xE01F0) then
tex.sprint(cat_lp, spccmd)
end
}
\def\ltj@lst@hss@ivs#1{%
- \directlua{luatexja.lst.althss('\luatexluaescapestring{#1}')}#1%
+ \directlua{luatexja.listings.althss('\luatexluaescapestring{#1}')}#1%
}
\def\ltj@lst@hss@double{\lst@hss\lst@hss}
\newluatexcatcodetable\CatcodeTableLTJlistings
\setluatexcatcodetable\CatcodeTableLTJlistings{%
\luatexcatcodetable\CatcodeTableLaTeXAtLetter
- \catcode"FFFFF=13%"
+ \catcode\ltjlineendcomment=13%"
\SetCatcodeRange{"FF61}{"FF9F}{13}% 半角カナ
\SetCatcodeRange{"E0100}{"E01EF}{13}% 漢字用異体字セレクタ
\SetCatcodeRange{"FE00}{"FE0F}{13}% Variation Selector
}
-% redefine \lstinline@ and \lst@InlineG
-% because \lstinline!あ...! causes ``Runaway argument?'' Error
-\def\lstinline@#1{%
- \lst@Init\relax
- \ltj@lst@check@inline{\lst@InlineM#1}{\lst@InlineJ#1}}
-\def\lst@InlineG{%
- \lst@Init\relax
- \ltj@lst@check@inline{\lst@InlineM\}}%
- {\let\lst@arg\@empty \lst@InlineGJ}}
-
-\def\ltj@lst@check@inline#1#2#3{%
- \begingroup \lccode`\~=`#3\lowercase{\endgroup
- \ifx~}#3%
- \def\lst@next{#1}%
- \else\ifnum`#3>127\relax
- \def\lst@next{#1}%
- \else
- \def\lst@next{#2}%
- \fi\fi\lst@next #3}
+% redefine \lstinline and its inner commands to support Japanese characters
+\renewcommand\lstinline[1][]{%
+ \leavevmode\bgroup % \hbox\bgroup --> \bgroup
+ \def\lst@boxpos{b}%
+ \lsthk@PreSet\lstset{flexiblecolumns,#1}%
+ \lsthk@TextStyle
+ \@ifnextchar\bgroup \ltj@lst@InlineG \ltj@lstinline@}
+\def\ltj@lstinline@#1{%
+ \edef\ltj@lst@temp{\the\catcode`#1}\lst@Init\relax\catcode`#1\ltj@lst@temp
+ \lst@InlineJ#1}
+\def\ltj@lst@InlineG{%
+ \lst@Init\relax\edef\ltj@lst@temp{\the\catcode`\}}\catcode`\}=2 \catcode`\ =12\relax
+ \let\lst@arg\@empty\afterassignment\ltj@lst@InlineG@@\@temptokena}
+\def\ltj@lst@InlineG@@{%
+ \catcode`\}=\ltj@lst@temp%
+ \expandafter\expandafter\expandafter\lst@InsideConvert%
+ \expandafter{\the\@temptokena}\lst@arg\lst@DeInit\egroup}
% We redefine \lst@BeginDropInput, since now we have
% two additional `process macros'.
\let\ltj@lst@ProcessJALetterHalf\@gobble % added
}}
+\directlua{
+ local utfchar, getcount = unicode.utf8.char, tex.getcount
+ luatexja.listings.insert_cb = function()
+ if not luatexja.listings.patched then
+ luatexja.listings.patched = 1
+ luatexbase.add_to_callback('process_input_buffer',
+ function(buf)
+ local ret = ''
+ for i = 1, utf.len(buf) do
+ local c = utf.sub(buf, i, i)
+ local cu = utf.byte(c)
+ if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then
+ ret = ret .. utfchar(getcount('ltjlineendcomment'))
+ end
+ ret = ret .. c
+ end
+ return ret
+ end, 'ltj.listings_unicode', 1)
+ end
+ end
+ luatexja.listings.remove_cb = function()
+ if luatexja.listings.patched then
+ luatexja.listings.patched = nil
+ luatexbase.remove_from_callback('process_input_buffer',
+ 'ltj.listings_unicode')%
+ end
+ end}
% hook!
\lst@AddToHook{Init}{%
\luatexcatcodetable\CatcodeTableLTJlistings\ltj@@listing@jpcmd
- \lccode`\~="FFFFF\lowercase{\def~{\ltj@lst@ProcessJALetter}}%"
- \directlua{luatexbase.add_to_callback('process_input_buffer',
- function(buf)
- local ret = ''
- for i = 1, utf.len(buf) do
- local c = utf.sub(buf, i, i)
- local cu = utf.byte(c)
- if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then
- ret = ret .. utf.char(1048575) % U+FFFFF
- end
- ret = ret .. c
- end
- return ret
- end, 'ltj.listings_unicode', 1)}%
+ \lccode`\~=\ltjlineendcomment\lowercase{\def~{\ltj@lst@ProcessJALetter}}%"
+ \directlua{luatexja.listings.insert_cb()}%
\if@ltj@lst@double
\let\ltj@lst@hss@normal=\ltj@lst@hss@double
\else
\let\ltj@lst@hss=\ltj@lst@hss@normal
\fi
}
+
+\def\ltj@lst@MakeActive#1{%
+ \let\lst@temp\@empty \ltj@lst@MakeActive@#1\relax}
+\begingroup
+\catcode`\^^A=12
+\catcode`\^^@=\active
+\lccode`\$=\ltjlineendcomment \catcode`\$=13 %"
+\lowercase{%
+\gdef\ltj@lst@MakeActive@#1{\let\lst@next\relax%
+ \ifx#1\relax
+ \else\let\lst@next\ltj@lst@MakeActive@
+ \ifnum`#1>127
+ \lccode`\^^A=`#1
+ \lowercase{\lst@lAddTo\lst@temp{$^^A}}%$
+ \else
+ \lccode`\^^@=`#1
+ \lowercase{\lst@lAddTo\lst@temp{^^@}}%
+ \fi\fi\lst@next}}
+\endgroup
+
+
+\begingroup \lccode`\~=`\ \relax \lowercase{%
+\gdef\lst@InsideConvert@#1 #2{%
+ \ltj@lst@MakeActive{#1}%
+ \ifx\@empty#2%
+ \lst@lExtend\lst@arg{\lst@temp}%
+ \else
+ \lst@lExtend\lst@arg{\lst@temp~}%
+ \expandafter\lst@InsideConvert@
+ \fi#2}
+}\endgroup
+
\lst@AddToHook{ExitVars}{%
- \directlua{luatexbase.remove_from_callback('process_input_buffer',
- 'ltj.listings_unicode')}%
+ \directlua{luatexja.listings.remove_cb()}%
}
-
% 白線対策
-\def\lst@OutputToken{%
- \lst@TrackNewLines \lst@OutputLostSpace
- \lst@ifgobbledws
- \lst@gobbledwhitespacefalse
- \lst@@discretionary
+\newif\ifltj@lst@frame@top
+\newdimen\ltj@lst@frame@lslimit
+\gdef\lst@frameInit{%
+ \ltj@lst@frame@toptrue
+ \ifx\lst@framelshape\@empty \let\lst@frameL\@empty \fi
+ \ifx\lst@framershape\@empty \let\lst@frameR\@empty \fi
+ \def\lst@framevrule{\vrule\@width\lst@framerulewidth\relax}%
+ \lst@ifframeround
+ \lst@frameCalcDimA\z@ \@getcirc\@tempdima
+ \@tempdimb\@tempdima \divide\@tempdimb\tw@
+ \advance\@tempdimb -\@wholewidth
+ \edef\lst@frametextsep{\the\@tempdimb}%
+ \edef\lst@framerulewidth{\the\@wholewidth}%
+ \lst@frameCalcDimA\@ne \@getcirc\@tempdima
+ \@tempdimb\@tempdima \divide\@tempdimb\tw@
+ \advance\@tempdimb -\tw@\@wholewidth
+ \advance\@tempdimb -\lst@frametextsep
+ \edef\lst@rulesep{\the\@tempdimb}%
\fi
- \lst@CheckMerge
- {\lst@thestyle{\lst@FontAdjust
- \setbox\@tempboxa\lst@hbox
- {\lsthk@OutputBox
- \lst@lefthss
- \expandafter\lst@FillOutputBox\the\lst@token\@empty
- \lst@righthss}%
- \ht\@tempboxa=0pt\dp\@tempboxa=0pt
- \lst@CalcLostSpaceAndOutput}}%
- \lst@ResetToken}
+ \lst@frameMakeBoxV\lst@framebox{\ht\strutbox}{\dp\strutbox}%
+ %%%% ここから
+ \@tempdima\z@
+ \ifdim\ht\strutbox<\cht\@tempdima=\dimexpr\cht-\ht\strutbox\relax\fi
+ \ifdim\dp\strutbox<\cdp\@tempdima=\dimexpr\cdp-\dp\strutbox\relax\fi
+ \ltj@lst@frame@lslimit=-\@tempdima
+ \def\lst@framelr{%
+ \ifltj@lst@frame@top\ltj@lst@frame@topfalse\else\lineskiplimit\ltj@lst@frame@lslimit\fi
+ \copy\lst@framebox}%
+ %%%% ここまで
+ \ifx\lst@frametshape\@empty\else
+ \lst@frameH T\lst@frametshape
+ \ifvoid\z@\else
+ \par\lst@parshape
+ \@tempdima-\baselineskip \advance\@tempdima\ht\z@
+ \ifdim\prevdepth<\@cclvi\p@\else
+ \advance\@tempdima\prevdepth
+ \fi
+ \ifdim\@tempdima<\z@
+ \vskip\@tempdima\vskip\lineskip
+ \fi
+ \noindent\box\z@\par
+ \lineskiplimit\maxdimen \lineskip\z@
+ \fi
+ \lst@frameSpreadV\lst@framextopmargin
+ \fi}
+
+
%%%%%%%%%%%%%%%% escape to \LaTeX
\lstloadaspects{escape}
{\lst@escapeend #4\lst@LeaveAllModes\lst@ReenterModes
\lst@newlines\z@ \lst@whitespacefalse}%
{}%
- \fi
- #3\catcode"FFFFF=9\lst@escapebegin%"
+ \fi%
+ \ltj@lst@escape@setup#2%
+ #3\catcode\ltjlineendcomment=9\lst@escapebegin\expandafter\lst@next%"
\fi}%
{}}
+\def\ltj@lst@escape@setup#1{%
+ \begingroup\lccode`\~=`#1\lowercase{%
+ \gdef\lst@next##1~{%
+ \let\lst@arg\@empty\ltj@lst@remove@jacmd{##1}%
+ \expandafter\expandafter\expandafter\scantokens\expandafter{\lst@arg}%
+ ~}%
+ }\endgroup
+}
+\begingroup
+ \lccode`\|=\ltjlineendcomment \lowercase{%"
+ \gdef\ltj@lst@remove@jacmd#1{%
+ \expandafter\ltj@lst@remove@jacmd@\detokenize{#1}|\@nil|}
+ \gdef\ltj@lst@remove@jacmd@#1|{%
+ \ifx#1\@nil\else
+ \lst@lAddTo\lst@arg{#1}%
+ \expandafter\ltj@lst@remove@jacmd@
+ \fi}}
+\endgroup
%%%%%%%%%%%%%%%%
\lstloadaspects{writefile}
\gdef\lst@breakProcessOther#1{\lst@ProcessOther#1}
% ソースコード目次における文字と番号の空き
\let \l@lstlisting = \l@figure
+
+%%%%
% キャプションとソースコード目次に対する日本語対応
-\def\lstlistingname{ソースコード}
-\def\lstlistlistingname{ソースコード目次}
+%\def\lstlistingname{ソースコード}
+%\def\lstlistlistingname{ソースコード目次}
% \end{修正事項}
-\endinput
\ No newline at end of file
+%%%%
+
+\endinput
OSDN Git Service
