OSDN Git Service

Fix ticket 29311.
[luatex-ja/luatexja.git] / src / patches / lltjp-listings.sty
index 400757d..a65ee47 100644 (file)
@@ -1,12 +1,10 @@
 %
 % lltjp-listings.sty
 %
-% Modified from jlisting.sty (by Thor) for LuaTeX-ja. 
-%
 
 \NeedsTeXFormat{LaTeX2e}
-\def\filedate{2012/01/11}
-\def\fileversion{0.4}
+\def\filedate{2012/02/02}
+\def\fileversion{0.51}
 \ProvidesPackage{lltjp-listings}[\filedate\space\fileversion]
 \RequirePackage{listings,luatexbase-cctb}
 
 \setluatexcatcodetable\CatcodeTableLTJlistings{
   \luatexcatcodetable\CatcodeTableLaTeXAtLetter
   \catcode"FFFFF=9%"
-  \setcatcoderange{"3000}{"65535}{13}}
+  \setcatcoderange{"2000}{"FFFF}{13}%
+  \setcatcoderange{"20000}{"2FFFF}{13}}
 
+% lowest level
+\def\lst@kanjitrue{\let\lst@ifkanji\iftrue}
+\def\lst@kanjifalse{\let\lst@ifkanji\iffalse}
+\lst@AddToHook{InitVars}{\lst@kanjifalse}
 
-\def\ltj@@listing@jpset@#1#2{{\lccode`\~=#1\lccode`\/=#1
-    \lowercase{\gdef\@temp{\gdef~{#2/}}}}%
-  \@temptokena\expandafter\expandafter\expandafter\expandafter%
-  \expandafter\expandafter\expandafter{\expandafter\expandafter%
-  \expandafter\the\expandafter\@temptokena\@temp}%
+\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
+    \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
+    \else
+      \lst@ifkanji\else\lst@OutputOther\fi
+    \fi\lst@letterfalse\lst@kanjitrue
+    \advance\lst@length\@ne\lst@Append}
+
+
+% loading lltjp-listing-jpt.tex
+\def\ltj@@listing@jpset#1#2{% fast: #2-#1+1 must be a multiple of 16
+  \@tempcnta=#1 \@tempcntb=#2 \@temptokena{}%
+  \loop\relax\ifnum\@tempcnta<\@tempcntb\relax
+    \ltj@@listing@jpset@\global\advance\@tempcnta\sixt@@n\repeat
+  \ltj@@listing@jpset@after{#1}
+}
+\def\ltj@@listing@jpsetN#1#2#3{% for (not large) range
+  \@tempcnta=#1 \@tempcntb=#2 \@temptokena{}%
+  \loop \global\advance\@tempcnta\@ne\ifnum\@tempcnta<\@tempcntb\relax
+    \ltj@@listing@jpsetN@{\@tempcnta}{#3}\repeat
+  \ltj@@listing@jpset@after{#1}
 }
 
-\def\ltj@@listing@jpset#1#2#3 {%
-  \@tempcnta=#1 \@tempcntb=#2 \@temptokena{}
-  \loop \advance\@tempcnta\@ne\ifnum\@tempcnta<\@tempcntb\relax
-    \ltj@@listing@jpset@{\the\@tempcnta}#3\repeat
+\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}
+  \expandafter\the\expandafter\toks@\csname ltj@@listing@jpcmd@i#1\endcsname}%
+  \@temptokena{}%
 }
 
-\input lltjp-listings-jpt.tex
+\begingroup
+\catcode`\^^a0=13\catcode`\^^a1=13\catcode`\^^a2=13\catcode`\^^a3=13
+\catcode`\^^a4=13\catcode`\^^a5=13\catcode`\^^a6=13\catcode`\^^a7=13
+\catcode`\^^a8=13\catcode`\^^a9=13\catcode`\^^aa=13\catcode`\^^ab=13
+\catcode`\^^ac=13\catcode`\^^ad=13\catcode`\^^ae=13\catcode`\^^af=13
+\catcode`\^^b0=12\catcode`\^^b1=12\catcode`\^^b2=12\catcode`\^^b3=12
+\catcode`\^^b4=12\catcode`\^^b5=12\catcode`\^^b6=12\catcode`\^^b7=12
+\catcode`\^^b8=12\catcode`\^^b9=12\catcode`\^^ba=12\catcode`\^^bb=12
+\catcode`\^^bc=12\catcode`\^^bd=12\catcode`\^^be=12\catcode`\^^bf=12
+\gdef\ltj@@listing@jpset@{%
+   {\lccode`\^^a0=\@tempcnta \lccode`\^^b0=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a1=\@tempcnta \lccode`\^^b1=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a2=\@tempcnta \lccode`\^^b2=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a3=\@tempcnta \lccode`\^^b3=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a4=\@tempcnta \lccode`\^^b4=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a5=\@tempcnta \lccode`\^^b5=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a6=\@tempcnta \lccode`\^^b6=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a7=\@tempcnta \lccode`\^^b7=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a8=\@tempcnta \lccode`\^^b8=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^a9=\@tempcnta \lccode`\^^b9=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^aa=\@tempcnta \lccode`\^^ba=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^ab=\@tempcnta \lccode`\^^bb=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^ac=\@tempcnta \lccode`\^^bc=\@tempcnta
+    \advance\@tempcnta\@ne\lccode`\^^ad=\@tempcnta \lccode`\^^bd=\@tempcnta
+    \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}%
+    }}%\message{\meaning\@temp}%
+  }%
+  \@temptokena\expandafter\expandafter\expandafter\expandafter%
+  \expandafter\expandafter\expandafter{\expandafter\expandafter%
+  \expandafter\the\expandafter\@temptokena\@temp}%
+}
+\gdef\ltj@@listing@jpsetN@#1#2{{%
+    \@tempcnta=#1 \lccode`\~=\@tempcnta \lccode`\/=\@tempcnta
+    \lowercase{\gdef\@temp{\gdef~{#2/}}}}%
+  \@temptokena\expandafter\expandafter\expandafter\expandafter%
+  \expandafter\expandafter\expandafter{\expandafter\expandafter%
+  \expandafter\the\expandafter\@temptokena\@temp}%
+}
+\endgroup
 
+
+\toks@{}
+\input lltjp-listings-jpt.tex
 \edef\ltj@@listing@jpcmd{\the\toks@}
 \toks@{}
 \lst@AddToHook{Init}{%
   \luatexcatcodetable\CatcodeTableLTJlistings
   \ltj@@listing@jpcmd}
 
-\def\lst@ProcessJALetter{\lst@whitespacefalse \lst@AppendJALetter}
-\def\lst@AppendJALetter{%
-    \lst@ifletter \lst@Output\else\lst@OutputOther\fi\lst@lettertrue
-    \advance\lst@length\@ne\lst@Append}
-\def\lst@ProcessJALetterHalf{\lst@whitespacefalse \lst@AppendJALetterHalf}
-\def\lst@AppendJALetterHalf{%
-    \lst@ifletter \lst@Output\else\lst@OutputOther\fi\lst@lettertrue
-    \lst@Append}
-
 
 % 白線対策
 \def\lst@OutputToken{%
     \lst@ResetToken}
 
 
+%    \begin{修正事項}{1.3} from jlisting.sty
+% ちょっとした修正
+\gdef\lst@breakProcessOther#1{\lst@ProcessOther#1}
+% ソースコード目次における文字と番号の空き
+\let \l@lstlisting = \l@figure
+% キャプションとソースコード目次に対する日本語対応
+\def\lstlistingname{ソースコード}
+\def\lstlistlistingname{ソースコード目次}
+%    \end{修正事項}
 \endinput
\ No newline at end of file