X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjp-listings.sty;h=b2c7d9afea2e88c50e01817f5a7b8a8e4d6578ea;hb=67291f7f1dee7f7ace5c41e9b881eb3ca8b727c3;hp=f175f88f76b2ea29308ea0eb417fc32c09afd63f;hpb=14046c09b1d6b915fb067ddb26ab0ddbed3f4f4a;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty
index f175f88..b2c7d9a 100644
--- a/src/patches/lltjp-listings.sty
+++ b/src/patches/lltjp-listings.sty
@@ -3,47 +3,81 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\def\filedate{2012/09/22}
-\def\fileversion{0.6}
-\ProvidesPackage{lltjp-listings}[\filedate\space\fileversion]
+\ProvidesPackage{lltjp-listings}[2014/01/09 Patch to listings for LuaTeX-ja]
 \RequirePackage{listings,luatexbase-cctb}
 
+%%%%%%%%%%%%%%%% Japanese support
+%% IVS support
+\newif\if@ltj@lst@vsraw \@ltj@lst@vsrawfalse
+\def\ltj@lst@vscmd{}
+\lst@Key{vsraw}f[t]{\lstKV@SetIf{#1}\if@ltj@lst@vsraw}
+\lst@Key{vscmd}\relax{\def\ltj@lst@vscmd{#1}}
+
+% 既定の IVS 出力コマンド
+\def\ltjlistingsvsstdcmd#1{\@tempdima=\f@size pt%
+  \smash{\raisebox{.35\@tempdima}{\tt%
+    \fboxsep=.1\@tempdima\fbox{\fontsize{.5\@tempdima}{\z@}\selectfont
+      \oalign{\hss VS\hss\crcr\hss#1\hss\crcr}}}}}
+\def\ltj@lst@vscmd{\ltjlistingsvsstdcmd}
+
+% 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{%
+  \ifx\@empty#1\else\ltj@lst@hss#1\expandafter\lst@FillFixed@\fi}
+
+\directlua{
+  local cat_str = luatexbase.catcodetables['string']
+  local cat_lp  = luatexbase.catcodetables['latex-package']
+  local ubyte = unicode.utf8.byte
+  luatexja.lst = {}
+  function luatexja.lst.althss(t)
+    t = ubyte(t)
+    if not (t>=0xE0100 and t<0xE01F0) then
+      tex.sprint(cat_lp, string.char(0x5C) .. 'lst@hss')
+    end
+  end
+}
+\gdef\ltj@lst@hss@ivs#1{%
+  \directlua{luatexja.lst.althss('\luatexluaescapestring{#1}')}#1%
+}
+
 % lowest level
-\def\lst@kanjitrue{\let\lst@ifkanji\iftrue}
-\def\lst@kanjifalse{\let\lst@ifkanji\iffalse}
-\lst@AddToHook{InitVars}{\lst@kanjifalse}
+\newif\if@ltj@lst@kanji
+\lst@AddToHook{InitVars}{\@ltj@lst@kanjifalse}
 
 \def\lst@AppendLetter{%
     \ltj@lst@setletterflag\lst@Append}
 \def\lst@AppendOther{%
-    \lst@ifletter\lst@Output\lst@letterfalse\fi\lst@kanjifalse
+    \lst@ifletter\lst@Output\lst@letterfalse\fi\@ltj@lst@kanjifalse
     \futurelet\lst@lastother\lst@Append}
 
 \def\ltj@lst@setletterflag{%
   \lst@ifletter
-    \lst@ifkanji\lst@Output\lst@kanjifalse\fi
+    \if@ltj@lst@kanji\lst@Output\@ltj@lst@kanjifalse\fi
   \else
-    \lst@lettertrue\lst@ifkanji\lst@kanjifalse\else\lst@OutputOther\fi
+    \lst@lettertrue\if@ltj@lst@kanji\@ltj@lst@kanjifalse\else\lst@OutputOther\fi
   \fi}
 
 \def\ltj@lst@setkanjiflag{%
   \lst@ifletter
     \lst@Output
   \else
-    \lst@ifkanji\else\lst@OutputOther\fi\lst@lettertrue
+    \if@ltj@lst@kanji\else\lst@OutputOther\fi\lst@lettertrue
   \fi}
 
 \def\ltj@lst@setopenflag{%
   \lst@ifletter
     \lst@letterfalse\lst@Output
   \else
-    \lst@ifkanji\else\lst@OutputOther\fi
-  \fi\lst@kanjitrue}
+    \if@ltj@lst@kanji\else\lst@OutputOther\fi
+  \fi\@ltj@lst@kanjitrue}
 
 \def\ltj@lst@setcloseflag{%
-  \lst@ifletter\else\lst@lettertrue\fi\lst@kanjitrue}
+  \lst@ifletter\else\lst@lettertrue\fi\@ltj@lst@kanjitrue}
 
-\def\lst@ProcessJALetter#1{%
+% Processing Japanese characters
+\def\ltj@lst@ProcessJALetter#1{%
   \lst@whitespacefalse
   \ifnum\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{`#1}}=0
     \ifnum\ltjgetparameter{postbreakpenalty}{`#1}>0
@@ -60,7 +94,8 @@
   \fi
   \lst@Append#1}
 
-\def\lst@ProcessJALetterHalf#1{%
+% 半角カナ処理命令
+\def\ltj@lst@ProcessJALetterHalf#1{%
   \lst@whitespacefalse
   \ifnum\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{`#1}}=0
     \ifnum\ltjgetparameter{postbreakpenalty}{`#1}>0
@@ -77,22 +112,42 @@
   \fi
   \lst@Append#1}
 
+% 漢字用異体字セレクタ命令
+\def\ltj@lst@ProcessIVS#1{%
+  \lst@whitespacefalse
+  \if@ltj@lst@vsraw
+    \lst@Append#1\advance\lst@length\m@ne
+  \else
+    \lst@TrackNewLines\lst@OutputLostSpace \lst@PrintToken
+    \setbox\@tempboxa\hbox to 2\lst@width{\hss
+       \expandafter\expandafter\expandafter\ltj@lst@vscmd
+       \expandafter{\the\numexpr`#1-"E00EF\relax}%"
+    \hss}%
+    \lst@CalcLostSpaceAndOutput\lst@whitespacefalse
+  \fi
+}
 
-% 半角カナの扱い
+% Variation Selector
+\def\ltj@lst@ProcessVS#1{%
+  \lst@whitespacefalse
+  \if@ltj@lst@vsraw
+    \lst@Append#1\advance\lst@length\m@ne
+  \else
+    \lst@TrackNewLines\lst@OutputLostSpace \lst@PrintToken
+    \setbox\@tempboxa\hbox to 2\lst@width{\hss
+       \expandafter\expandafter\expandafter\ltj@lst@vscmd
+       \expandafter{\the\numexpr`#1-"FDFF\relax}%"
+    \hss}%
+    \lst@CalcLostSpaceAndOutput\lst@whitespacefalse
+  \fi
+}
 
+
+% 半角カナ，異体字セレクタはアクティブ化
 \def\ltj@@listing@jpsetN#1#2#3{% for (not large) range
-  \@tempcnta=#1 \@tempcntb=\numexpr 1+#2\relax \@temptokena{}%
+  \@tempcnta=\numexpr#1-1\relax\@tempcntb=\numexpr 1+#2\relax
   \loop \global\advance\@tempcnta\@ne\ifnum\@tempcnta<\@tempcntb\relax
     \ltj@@listing@jpsetN@{\@tempcnta}{#3}\repeat
-  \ltj@@listing@jpset@after{#1}
-}
-
-\def\ltj@@listing@jpset@after#1{%
-  \expandafter\edef\csname ltj@@listing@jpcmd@i#1\endcsname{\the\@temptokena}%
-  \toks@\expandafter\expandafter\expandafter\expandafter%
-  \expandafter\expandafter\expandafter{\expandafter\expandafter%
-  \expandafter\the\expandafter\toks@\csname ltj@@listing@jpcmd@i#1\endcsname}%
-  \@temptokena{}%
 }
 
 \def\ltj@@listing@jpsetN@#1#2{{%
@@ -102,23 +157,44 @@
   \expandafter\expandafter\expandafter{\expandafter\expandafter%
   \expandafter\the\expandafter\@temptokena\@temp}%
 }
-
-\toks@{}
-\ltj@@listing@jpsetN{65377}{65439}{\lst@ProcessJALetterHalf}
-\edef\ltj@@listing@jpcmd{\the\toks@}\toks@{}
+\@temptokena{}
+\ltj@@listing@jpsetN{65377}{65439}{\ltj@lst@ProcessJALetterHalf}
+\ltj@@listing@jpsetN{65024}{65039}{\ltj@lst@ProcessVS}
+\ltj@@listing@jpsetN{917760}{917999}{\ltj@lst@ProcessIVS}
+\xdef\ltj@@listing@jpcmd{\the\@temptokena}\@temptokena{}
 
 % catcode 対策
 \newluatexcatcodetable\CatcodeTableLTJlistings
-\setluatexcatcodetable\CatcodeTableLTJlistings{
+\setluatexcatcodetable\CatcodeTableLTJlistings{%
   \luatexcatcodetable\CatcodeTableLaTeXAtLetter
   \catcode"FFFFF=13%"
-  \setcatcoderange{"FF61}{"FF9F}{13}%   半角文字
+  \SetCatcodeRange{"FF61}{"FF9F}{13}%     半角カナ
+  \SetCatcodeRange{"E0100}{"E01EF}{13}%   漢字用異体字セレクタ
+  \SetCatcodeRange{"FE00}{"FE0F}{13}%     Variation Selector
 }
 
+% We redefine \lst@BeginDropInput, since now we have
+% two additional `process macros'.
+\def\lst@BeginDropInput#1{%
+    \lst@EnterMode{#1}%
+    {\lst@modetrue
+     \let\lst@OutputBox\@gobble
+     \let\lst@ifdropinput\iftrue
+     \let\lst@ProcessLetter\@gobble
+     \let\lst@ProcessDigit\@gobble
+     \let\lst@ProcessOther\@gobble
+     \let\lst@ProcessSpace\@empty
+     \let\lst@ProcessTabulator\@empty
+     \let\lst@ProcessFormFeed\@empty
+     \let\ltj@lst@ProcessJALetter\@gobble     % added
+     \let\ltj@lst@ProcessJALetterHalf\@gobble % added
+}}
+
+
 % hook!
 \lst@AddToHook{Init}{
   \luatexcatcodetable\CatcodeTableLTJlistings\ltj@@listing@jpcmd
-  \lccode`\~="FFFFF\lowercase{\let~\lst@ProcessJALetter}%"
+  \lccode`\~="FFFFF\lowercase{\def~{\ltj@lst@ProcessJALetter}}%"
   \directlua{luatexbase.add_to_callback('process_input_buffer',
     function(buf)
       local ret = ''
@@ -131,8 +207,17 @@
         ret = ret .. c
       end
       return ret
-    end, 'ltj.listings_unicode', 1)}}
-\lst@AddToHook{ExitVars}{\directlua{luatexbase.remove_from_callback('process_input_buffer', 'ltj.listings_unicode')}}
+    end, 'ltj.listings_unicode', 1)}%
+  \if@ltj@lst@vsraw
+    \let\ltj@lst@hss=\ltj@lst@hss@ivs
+  \else
+    \let\ltj@lst@hss=\lst@hss
+  \fi
+}
+\lst@AddToHook{ExitVars}{%
+  \directlua{luatexbase.remove_from_callback('process_input_buffer', 
+    'ltj.listings_unicode')}%
+}
 
 
 % 白線対策
@@ -153,6 +238,56 @@
      \lst@CalcLostSpaceAndOutput}}%
     \lst@ResetToken}
 
+%%%%%%%%%%%%%%%% escape to \LaTeX
+\lstloadaspects{escape}
+\gdef\lst@Escape#1#2#3#4{%
+    \lst@CArgX #1\relax\lst@CDefX
+        {}%
+        {\lst@ifdropinput\else
+         \lst@TrackNewLines\lst@OutputLostSpace \lst@XPrintToken
+         \lst@InterruptModes
+         \lst@EnterMode{\lst@TeXmode}{\lst@modetrue}%
+         \ifx\^^M#2%
+             \lst@CArg #2\relax\lst@ActiveCDefX
+                 {}%
+                 {\lst@escapeend #4\lst@LeaveAllModes\lst@ReenterModes}%
+                 {\lst@MProcessListing}%
+         \else
+             \lst@CArg #2\relax\lst@ActiveCDefX
+                 {}%
+                 {\lst@escapeend #4\lst@LeaveAllModes\lst@ReenterModes
+                  \lst@newlines\z@ \lst@whitespacefalse}%
+                 {}%
+         \fi
+         #3\catcode"FFFFF=9\lst@escapebegin%"
+         \fi}%
+        {}}
+
+%%%%%%%%%%%%%%%%
+\lstloadaspects{writefile}
+\begingroup \catcode`\^^I=11
+\gdef\lst@WFBegin#1#2{%
+    \begingroup
+    \let\lst@OutputBox#1%
+    \def\lst@Append##1{%
+        \advance\lst@length\@ne
+        \expandafter\lst@token\expandafter{\the\lst@token##1}%
+        \ifx ##1\lst@outputspace \else
+            \lst@WFAppend##1%
+        \fi}%
+    \lst@lAddTo\lst@PreGotoTabStop{\lst@WFAppend{^^I}}%
+    \lst@lAddTo\lst@ProcessSpace{\lst@WFAppend{ }}%
+    \def\ltj@lst@ProcessIVS##1{\lst@whitespacefalse\lst@Append##1}%
+    \def\ltj@lst@ProcessVS##1{\lst@whitespacefalse\lst@Append##1}%
+    \let\lst@DeInit\lst@WFDeInit
+    \let\lst@MProcessListing\lst@WFMProcessListing
+    \lst@WFifopen\else
+        \immediate\openout\lst@WF=#2\relax
+        \global\let\lst@WFifopen\iftrue
+        \@gobbletwo\fi\fi
+    \fi}
+\endgroup
+
 
 %    \begin{修正事項}{1.3} from jlisting.sty
 % ちょっとした修正