From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sat, 22 Sep 2012 06:48:35 +0000 (+0900)
Subject: I forgot to include changes ^^;
X-Git-Tag: 20121209.0~31
X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=855baf96ec40c886cb1ac2a2e873afc481c524ae

I forgot to include changes ^^;
---

diff --git a/src/patches/lltjp-listings-jpt.tex b/src/patches/lltjp-listings-jpt.tex
index 505ea38..48a928a 100644
--- a/src/patches/lltjp-listings-jpt.tex
+++ b/src/patches/lltjp-listings-jpt.tex
@@ -1,5 +1,68 @@
 % This file is automatically generated by ltjlist.lua.
 \message{BMP}
+\ltj@@listing@jpset{128}{255}
+\ltj@@listing@jpset{256}{383}
+\ltj@@listing@jpset{384}{511}
+\ltj@@listing@jpset{512}{639}
+\ltj@@listing@jpset{640}{767}
+\ltj@@listing@jpset{768}{895}
+\ltj@@listing@jpset{896}{1023}
+\ltj@@listing@jpset{1024}{1151}
+\ltj@@listing@jpset{1152}{1279}
+\ltj@@listing@jpset{1280}{1407}
+\ltj@@listing@jpset{1408}{1535}
+\ltj@@listing@jpset{1536}{1663}
+\ltj@@listing@jpset{1664}{1791}
+\ltj@@listing@jpset{1792}{1919}
+\ltj@@listing@jpset{1920}{2047}
+\ltj@@listing@jpset{2048}{2175}
+\ltj@@listing@jpset{2176}{2303}
+\ltj@@listing@jpset{2304}{2431}
+\ltj@@listing@jpset{2432}{2559}
+\ltj@@listing@jpset{2560}{2687}
+\ltj@@listing@jpset{2688}{2815}
+\ltj@@listing@jpset{2816}{2943}
+\ltj@@listing@jpset{2944}{3071}
+\ltj@@listing@jpset{3072}{3199}
+\ltj@@listing@jpset{3200}{3327}
+\ltj@@listing@jpset{3328}{3455}
+\ltj@@listing@jpset{3456}{3583}
+\ltj@@listing@jpset{3584}{3711}
+\ltj@@listing@jpset{3712}{3839}
+\ltj@@listing@jpset{3840}{3967}
+\ltj@@listing@jpset{3968}{4095}
+\ltj@@listing@jpset{4096}{4223}
+\ltj@@listing@jpset{4224}{4351}
+\ltj@@listing@jpset{4352}{4479}
+\ltj@@listing@jpset{4480}{4607}
+\ltj@@listing@jpset{4608}{4735}
+\ltj@@listing@jpset{4736}{4863}
+\ltj@@listing@jpset{4864}{4991}
+\ltj@@listing@jpset{4992}{5119}
+\ltj@@listing@jpset{5120}{5247}
+\ltj@@listing@jpset{5248}{5375}
+\ltj@@listing@jpset{5376}{5503}
+\ltj@@listing@jpset{5504}{5631}
+\ltj@@listing@jpset{5632}{5759}
+\ltj@@listing@jpset{5760}{5887}
+\ltj@@listing@jpset{5888}{6015}
+\ltj@@listing@jpset{6016}{6143}
+\ltj@@listing@jpset{6144}{6271}
+\ltj@@listing@jpset{6272}{6399}
+\ltj@@listing@jpset{6400}{6527}
+\ltj@@listing@jpset{6528}{6655}
+\ltj@@listing@jpset{6656}{6783}
+\ltj@@listing@jpset{6784}{6911}
+\ltj@@listing@jpset{6912}{7039}
+\ltj@@listing@jpset{7040}{7167}
+\ltj@@listing@jpset{7168}{7295}
+\ltj@@listing@jpset{7296}{7423}
+\ltj@@listing@jpset{7424}{7551}
+\ltj@@listing@jpset{7552}{7679}
+\ltj@@listing@jpset{7680}{7807}
+\ltj@@listing@jpset{7808}{7935}
+\ltj@@listing@jpset{7936}{8063}
+\ltj@@listing@jpset{8064}{8191}
 \ltj@@listing@jpset{8192}{8319}
 \ltj@@listing@jpset{8320}{8447}
 \ltj@@listing@jpset{8448}{8575}
@@ -960,82 +1023,7 @@
 \ltj@@listing@jpset{196352}{196479}
 \ltj@@listing@jpset{196480}{196607}
 \message{Hankaku}
-\ltj@@listing@jpsetN{65280}{65376}{\lst@ProcessJALetter}
+\ltj@@listing@jpsetN{65280}{65376}{\lst@ProcessLetter}
 \ltj@@listing@jpsetN{65377}{65439}{\lst@ProcessJALetterHalf}
-\ltj@@listing@jpsetN{65504}{65509}{\lst@ProcessJALetter}
-
-\message{Opening and Closing brackets}
-\@temptokena{}% DO NOT REMOVE THIS LINE
-
-\ltj@@listing@jpsetN@{`，}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`。}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`，}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`．}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`・}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`：}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`；}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`？}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`！}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`゛}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"212B
-\ltj@@listing@jpsetN@{`゜}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"212C
-\ltj@@listing@jpsetN@{`´}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"212D
-\ltj@@listing@jpsetN@{`｀}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"212E
-\ltj@@listing@jpsetN@{`々}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2139
-\ltj@@listing@jpsetN@{`…}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2144
-\ltj@@listing@jpsetN@{`‥}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2145
-\ltj@@listing@jpsetN@{`‘}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2146
-\ltj@@listing@jpsetN@{`’}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2147
-\ltj@@listing@jpsetN@{`“}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2148
-\ltj@@listing@jpsetN@{`”}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2149
-\ltj@@listing@jpsetN@{`）}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`（}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`｝}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`｛}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`ï¼½}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`ï¼»}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`〔}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"214C
-\ltj@@listing@jpsetN@{`〕}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"214D
-\ltj@@listing@jpsetN@{`〈}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2152
-\ltj@@listing@jpsetN@{`〉}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2153
-\ltj@@listing@jpsetN@{`《}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2154
-\ltj@@listing@jpsetN@{`》}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2155
-\ltj@@listing@jpsetN@{`「}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2156
-\ltj@@listing@jpsetN@{`」}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2157
-\ltj@@listing@jpsetN@{`『}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"2158
-\ltj@@listing@jpsetN@{`』}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"2159
-\ltj@@listing@jpsetN@{`【}{\lst@ProcessJALetter@inhibit@postbreak}%\jis"215A
-\ltj@@listing@jpsetN@{`】}{\lst@ProcessJALetter@inhibit@prebreak}%\jis"215B
-\ltj@@listing@jpsetN@{`ー}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〳}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〴}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〵}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〻}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`⦅}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`⦆}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`｟}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`ï½ }{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〘}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`〙}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〖}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`〗}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`«}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`»}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`〝}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`〟}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`‼}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`⁇}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`⁈}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`⁉}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`¡}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`¿}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`ː}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`ª}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`º}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`¹}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`²}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`³}{\lst@ProcessJALetter@inhibit@prebreak}
-\ltj@@listing@jpsetN@{`€}{\lst@ProcessJALetter@inhibit@postbreak}
-\ltj@@listing@jpsetN@{`™}{\lst@ProcessJALetter@inhibit@prebreak}
-
-\ltj@@listing@jpset@after{other}% DO NOT REMOVE THIS LINE
+\ltj@@listing@jpsetN{65504}{65509}{\lst@ProcessLetter}
 \message{done.}
diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty
index aa8c2bd..19ecece 100644
--- a/src/patches/lltjp-listings.sty
+++ b/src/patches/lltjp-listings.sty
@@ -3,8 +3,8 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\def\filedate{2012/02/02}
-\def\fileversion{0.51}
+\def\filedate{2012/09/22}
+\def\fileversion{0.6}
 \ProvidesPackage{lltjp-listings}[\filedate\space\fileversion]
 \RequirePackage{listings,luatexbase-cctb}
 
@@ -13,8 +13,9 @@
 \setluatexcatcodetable\CatcodeTableLTJlistings{
   \luatexcatcodetable\CatcodeTableLaTeXAtLetter
   \catcode"FFFFF=9%"
-  \setcatcoderange{"2000}{"FFFF}{13}%
-  \setcatcoderange{"20000}{"2FFFF}{13}}
+  \setcatcoderange{"0080}{"FFFF}{13}%   BMP
+  \setcatcoderange{"20000}{"2FFFF}{13}% SIP
+}
 
 % lowest level
 \def\lst@kanjitrue{\let\lst@ifkanji\iftrue}
@@ -24,46 +25,64 @@
 \def\lst@AppendOther{%
     \lst@ifletter\lst@Output\lst@letterfalse\fi\lst@kanjifalse
     \futurelet\lst@lastother\lst@Append}
-\def\lst@AppendLetter{%
-    \lst@ifletter
-      \lst@ifkanji\lst@Output\lst@kanjifalse
-      \fi
-    \else
-      \lst@lettertrue\lst@ifkanji\lst@kanjifalse\else\lst@OutputOther\fi
-    \fi
-    \lst@Append}
-
-\def\lst@ProcessJALetter{\lst@whitespacefalse \lst@AppendJALetter}
-\def\lst@ProcessJALetterHalf{\lst@whitespacefalse \lst@AppendJALetterHalf}
-\def\lst@ProcessJALetter@inhibit@prebreak{%
-  \lst@whitespacefalse \lst@AppendJALetter@inhibit@prebreak}
-\def\lst@ProcessJALetter@inhibit@postbreak{%
-  \lst@whitespacefalse \lst@AppendJALetter@inhibit@postbreak}
-
-\def\lst@AppendJALetter{%
-    \lst@ifletter
-      \lst@Output
-    \else
-      \lst@ifkanji\else\lst@OutputOther\fi\lst@lettertrue
-    \fi\lst@kanjitrue
-    \advance\lst@length\@ne\lst@Append}
-\def\lst@AppendJALetterHalf{%
-    \lst@ifletter
-      \lst@Output
+
+\def\ltj@lst@setletterflag{%
+  \lst@ifletter
+    \lst@ifkanji\lst@Output\lst@kanjifalse\fi
+  \else
+    \lst@lettertrue\lst@ifkanji\lst@kanjifalse\else\lst@OutputOther\fi
+  \fi}
+
+\def\ltj@lst@setkanjiflag{%
+  \lst@ifletter
+    \lst@Output
+  \else
+    \lst@ifkanji\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}
+
+\def\ltj@lst@setcloseflag{%
+  \lst@ifletter\else\lst@lettertrue\fi\lst@kanjitrue}
+
+\def\lst@ProcessLetter#1{%
+  \lst@whitespacefalse
+  \ifnum\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{`#1}}=0
+    \ifnum\ltjgetparameter{postbreakpenalty}{`#1}>0
+      \ltj@lst@setopenflag    % 開き括弧類
     \else
-      \lst@ifkanji\else\lst@OutputOther\fi\lst@lettertrue
-    \fi\lst@kanjitrue
-    \lst@Append}
-\def\lst@AppendJALetter@inhibit@prebreak{%
-    \lst@ifletter\else\lst@lettertrue\fi\lst@kanjitrue
-    \advance\lst@length\@ne\lst@Append}
-\def\lst@AppendJALetter@inhibit@postbreak{%
-    \lst@ifletter
-      \lst@Output
+      \ifnum\ltjgetparameter{prebreakpenalty}{`#1}>0
+        \ltj@lst@setcloseflag % 閉じ括弧類，句読点
+      \else
+        \ltj@lst@setkanjiflag % 通常の和文文字
+    \fi\fi
+    \advance\lst@length\@ne   % 和文文字は通常の2倍の幅
+  \else
+    \ltj@lst@setletterflag
+  \fi
+  \lst@Append#1}
+
+\def\lst@ProcessJALetterHalf#1{%
+  \lst@whitespacefalse
+  \ifnum\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{`#1}}=0
+    \ifnum\ltjgetparameter{postbreakpenalty}{`#1}>0
+      \ltj@lst@setopenflag    % 開き括弧類
     \else
-      \lst@ifkanji\else\lst@OutputOther\fi
-    \fi\lst@letterfalse\lst@kanjitrue
-    \advance\lst@length\@ne\lst@Append}
+      \ifnum\ltjgetparameter{prebreakpenalty}{`#1}>0
+        \ltj@lst@setcloseflag % 閉じ括弧類
+      \else
+        \ltj@lst@setkanjiflag % 通常の和文文字
+    \fi\fi
+    \advance\lst@length\@ne   % 半角カナは欧文文字と同じ幅
+  \else
+    \ltj@lst@setletterflag
+  \fi
+  \lst@Append#1}
 
 
 % loading lltjp-listing-jpt.tex
@@ -115,14 +134,14 @@
     \advance\@tempcnta\@ne\lccode`\^^ae=\@tempcnta \lccode`\^^be=\@tempcnta
     \advance\@tempcnta\@ne\lccode`\^^af=\@tempcnta \lccode`\^^bf=\@tempcnta
     \lowercase{\gdef\@temp{%
-      \gdef^^a0{\lst@ProcessJALetter^^b0}\gdef^^a1{\lst@ProcessJALetter^^b1}%
-      \gdef^^a2{\lst@ProcessJALetter^^b2}\gdef^^a3{\lst@ProcessJALetter^^b3}%
-      \gdef^^a4{\lst@ProcessJALetter^^b4}\gdef^^a5{\lst@ProcessJALetter^^b5}%
-      \gdef^^a6{\lst@ProcessJALetter^^b6}\gdef^^a7{\lst@ProcessJALetter^^b7}%
-      \gdef^^a8{\lst@ProcessJALetter^^b8}\gdef^^a9{\lst@ProcessJALetter^^b9}%
-      \gdef^^aa{\lst@ProcessJALetter^^ba}\gdef^^ab{\lst@ProcessJALetter^^bb}%
-      \gdef^^ac{\lst@ProcessJALetter^^bc}\gdef^^ad{\lst@ProcessJALetter^^bd}%
-      \gdef^^ae{\lst@ProcessJALetter^^be}\gdef^^af{\lst@ProcessJALetter^^bf}%
+      \gdef^^a0{\lst@ProcessLetter^^b0}\gdef^^a1{\lst@ProcessLetter^^b1}%
+      \gdef^^a2{\lst@ProcessLetter^^b2}\gdef^^a3{\lst@ProcessLetter^^b3}%
+      \gdef^^a4{\lst@ProcessLetter^^b4}\gdef^^a5{\lst@ProcessLetter^^b5}%
+      \gdef^^a6{\lst@ProcessLetter^^b6}\gdef^^a7{\lst@ProcessLetter^^b7}%
+      \gdef^^a8{\lst@ProcessLetter^^b8}\gdef^^a9{\lst@ProcessLetter^^b9}%
+      \gdef^^aa{\lst@ProcessLetter^^ba}\gdef^^ab{\lst@ProcessLetter^^bb}%
+      \gdef^^ac{\lst@ProcessLetter^^bc}\gdef^^ad{\lst@ProcessLetter^^bd}%
+      \gdef^^ae{\lst@ProcessLetter^^be}\gdef^^af{\lst@ProcessLetter^^bf}%
     }}%\message{\meaning\@temp}%
   }%
   \@temptokena\expandafter\expandafter\expandafter\expandafter%