From 53f7e2d9406b8186bc4453cb6c13ac0f3b4156cb Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Thu, 2 Feb 2012 22:23:36 +0900 Subject: [PATCH] Bugfix and speed up lltjp-listings.sty. --- src/patches/lltjp-listings.sty | 62 ++++++++++++++++++++++++++++-------------- src/patches/ltjlist.lua | 2 +- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty index 6fc60cd..e367453 100644 --- a/src/patches/lltjp-listings.sty +++ b/src/patches/lltjp-listings.sty @@ -3,8 +3,8 @@ % \NeedsTeXFormat{LaTeX2e} -\def\filedate{2012/02/01} -\def\fileversion{0.5} +\def\filedate{2012/02/02} +\def\fileversion{0.51} \ProvidesPackage{lltjp-listings}[\filedate\space\fileversion] \RequirePackage{listings,luatexbase-cctb} @@ -13,9 +13,10 @@ \setluatexcatcodetable\CatcodeTableLTJlistings{ \luatexcatcodetable\CatcodeTableLaTeXAtLetter \catcode"FFFFF=9%" - \setcatcoderange{"3000}{"65535}{13}} + \setcatcoderange{"2000}{"FFFF}{13}% + \setcatcoderange{"20000}{"2FFFF}{13}} -% lower level +% lowest level \def\lst@ProcessJALetter{\lst@whitespacefalse \lst@AppendJALetter} \def\lst@AppendJALetter{% \lst@ifletter \lst@Output\else\lst@OutputOther\fi\lst@lettertrue @@ -26,10 +27,10 @@ \lst@Append} % loading lltjp-listing-jpt.tex -\def\ltj@@listing@jpset#1#2{% +\def\ltj@@listing@jpset#1#2{% fast: #2-#1+1 must be a multiple of 16 \@tempcnta=#1 \@tempcntb=#2 \@temptokena{}% - \loop \global\advance\@tempcnta8\ifnum\@tempcnta<\@tempcntb\relax - \ltj@@listing@jpset@\repeat + \loop\relax\ifnum\@tempcnta<\@tempcntb\relax + \ltj@@listing@jpset@\global\advance\@tempcnta\sixt@@n\repeat \expandafter\edef\csname ltj@@listing@jpcmd@i#1\endcsname{\the\@temptokena}% \toks@\expandafter\expandafter\expandafter\expandafter% \expandafter\expandafter\expandafter{\expandafter\expandafter% @@ -46,22 +47,41 @@ } \begingroup -\catcode`\^^A=13\catcode`\^^B=13\catcode`\^^C=13 -\catcode`\^^D=13\catcode`\^^E=13\catcode`\^^F=13\catcode`\^^G=13 +\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`\~=\@tempcnta \lccode`\/=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^A=\@tempcnta \lccode`0=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^B=\@tempcnta \lccode`2=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^C=\@tempcnta \lccode`3=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^D=\@tempcnta \lccode`4=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^E=\@tempcnta \lccode`5=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^F=\@tempcnta \lccode`6=\@tempcnta - \advance\@tempcnta\@ne\lccode`\^^G=\@tempcnta \lccode`7=\@tempcnta + {\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~{\lst@ProcessJALetter/}\gdef^^A{\lst@ProcessJALetter0}% - \gdef^^B{\lst@ProcessJALetter2}\gdef^^C{\lst@ProcessJALetter3}% - \gdef^^D{\lst@ProcessJALetter4}\gdef^^E{\lst@ProcessJALetter5}% - \gdef^^F{\lst@ProcessJALetter6}\gdef^^G{\lst@ProcessJALetter7}}}% + \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% diff --git a/src/patches/ltjlist.lua b/src/patches/ltjlist.lua index fc15eb5..dbe8e82 100644 --- a/src/patches/ltjlist.lua +++ b/src/patches/ltjlist.lua @@ -7,7 +7,7 @@ function innerN(a, b, c) print("\\ltj@@listing@jpsetN{" .. a .. "}{" .. b .. "}{" .. c .. "}") end -k = 256 +k = arg[1] t = {{0x2000, 0xFEFF, "BMP"}, {0x20000, 0x2FFFF, "SIP"}} for g, v in pairs(t) do print("\\message{" .. v[3] .. "}") -- 2.11.0