summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty21
1 files changed, 16 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
index 13f75e302e9..ee3c3aa14ba 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
@@ -1,9 +1,9 @@
%
-% lltjp-listings.sty 2018-09-17
+% lltjp-listings.sty 2020-03-23
%
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{listings,luatexbase-cctb}
+\RequirePackage{etoolbox,listings,luatexbase-cctb}
%%%%%%%%%%%%%%%% Japanese support
%% whether letter-space in a fixed mode box is doubled or not
@@ -26,8 +26,19 @@
% override \lst@FillFixed@
% \ltj@hst@hss is \ltj@lst@hss@ivs or \ltj@lst@hss@normal,
% according to vsraw = true or not.
+\def\lst@FillFixed#1{{\null#1\null}\lst@FillFixed@}
\def\lst@FillFixed@#1{%
- \ifx\@empty#1\else\ltj@lst@hss#1\expandafter\lst@FillFixed@\fi}
+ \ifx\@empty#1\else\ltj@lst@hss{\null#1\null}\expandafter\lst@FillFixed@\fi}
+\let\lst@FillOutputBox\lst@FillFixed
+% [space/full]flexiblemode (not much useful...)
+\def\ltj@lst@FillFlex#1\@empty{\null#1\null}
+\patchcmd\lst@column@flexible
+ {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{}
+\patchcmd\lst@column@fullflexible
+ {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{}
+\patchcmd\lst@column@spaceflexible
+ {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{}
+
\directlua{
local cat_str = luatexbase.catcodetables['string']
@@ -97,7 +108,8 @@
\else
\ltj@lst@setletterflag
\fi
- \lst@Append#1}
+ \lst@Append#1%
+}
% 半角カナ処理命令
\def\ltj@lst@ProcessJALetterHalf#1{%
@@ -423,7 +435,6 @@
\fi}
\endgroup
-
% \begin{修正事項}{1.3} from jlisting.sty
% ちょっとした修正
\gdef\lst@breakProcessOther#1{\lst@ProcessOther#1}