X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjp-listings.sty;h=9a5d9d2cbbc65d9e774503bfa1d02c768d0870d7;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=1234e3faa245d2f1ffdfdb617317942e822f148c;hpb=7f35ae8c3495bf9ddadef780051fdb12ecc4c6da;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty
index 1234e3f..9a5d9d2 100644
--- a/src/patches/lltjp-listings.sty
+++ b/src/patches/lltjp-listings.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-listings}[2015/11/05 Patch to listings for LuaTeX-ja]
+\ProvidesPackage{lltjp-listings}[2016/03/31 Patch to listings for LuaTeX-ja]
 \RequirePackage{listings,luatexbase-cctb}
 
 %%%%%%%%%%%%%%%% Japanese support
@@ -35,8 +35,8 @@
   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)
@@ -44,7 +44,7 @@
   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}
 
@@ -173,7 +173,7 @@
 \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
@@ -188,21 +188,15 @@
       \@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@Def{13}{\lst@DeInit\egroup \global\let\lst@inlinechars\@empty
-     \PackageError{Listings}{lstinline ended by EOL}\@ehc}%
   \lst@InlineJ#1}
 \def\ltj@lst@InlineG{%
-  \lst@Init\relax\edef\ltj@lst@temp{\the\catcode`\}}%
-  \catcode`\}=2 \catcode`\ =12\relax
-  \lst@Def{13}{\lst@DeInit\egroup \global\let\lst@inlinechars\@empty
-     \PackageError{Listings}{lstinline ended by EOL}\@ehc}%
+  \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
+  \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'.
 \def\lst@BeginDropInput#1{%
@@ -220,26 +214,39 @@
      \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{%
-    luatexja.patch_listings = 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 .. 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
@@ -257,14 +264,14 @@
 \begingroup
 \catcode`\^^A=12
 \catcode`\^^@=\active
-\lccode`\$="FFFFF \catcode`\$=13 %"
+\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}}%
+      \lowercase{\lst@lAddTo\lst@temp{$^^A}}%$
     \else
       \lccode`\^^@=`#1 
       \lowercase{\lst@lAddTo\lst@temp{^^@}}%
@@ -280,17 +287,12 @@
     \else
         \lst@lExtend\lst@arg{\lst@temp~}%
         \expandafter\lst@InsideConvert@
-    \fi #2}
+    \fi#2}
 }\endgroup
 
 \lst@AddToHook{ExitVars}{%
-  \directlua{%
-    if luatexja.patch_listings then
-      luatexja.patch_listings=nil
-      luatexbase.remove_from_callback('process_input_buffer', 
-        'ltj.listings_unicode')%
-    end}}
-
+  \directlua{luatexja.listings.remove_cb()}%
+}
 
 % 白線対策
 \newif\ifltj@lst@frame@top
@@ -316,7 +318,7 @@
     %%%%  ここから
     \@tempdima\z@
     \ifdim\ht\strutbox<\cht\@tempdima=\dimexpr\cht-\ht\strutbox\relax\fi
-    \ifdim\dp\strutbox<\cdp\advance\@tempdima=\dimexpr\cdp-\dp\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
@@ -361,10 +363,29 @@
                  {\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}
@@ -397,8 +418,12 @@
 \gdef\lst@breakProcessOther#1{\lst@ProcessOther#1}
 % ソースコード目次における文字と番号の空き
 \let \l@lstlisting = \l@figure
+
+%%%% 
 % キャプションとソースコード目次に対する日本語対応
-\def\lstlistingname{ソースコード}
-\def\lstlistlistingname{ソースコード目次}
+%\def\lstlistingname{ソースコード}
+%\def\lstlistlistingname{ソースコード目次}
 %    \end{修正事項}
+%%%%
+
 \endinput