Newsgroups: fj.sources,fj.sources.d
Path: galaxy.trc.rwcp.or.jp!coconuts.jaist!wnoc-tyo-news!sh.wide!wnoc-kyo-news!aist-nara!newspost.aist-nara.ac.jp!kazusi-m
From: Kazushi (Jam) Marukawa <kazusi-m@is.aist-nara.ac.jp>
Subject: Re: iso2022 patch for less-205
In-Reply-To: amaike@echizen.tt.kubota.co.jp's message of Tue, 23 Aug 1994
 01:44:15 GMT
Content-Type: text/plain; charset=ISO-2022-JP
Message-ID: <KAZUSI-M.94Aug23133336@soft.is.aist-nara.ac.jp>
Followup-To: fj.sources.d
Sender: news@newspost.aist-nara.ac.jp (USENET News System)
Nntp-Posting-Host: soft.aist-nara.ac.jp
Organization: NARA Institute of Science and Technology
References: <KAZUSI-M.94Aug18114455@soft.is.aist-nara.ac.jp>
 <1994Aug22.042752.16726@merope.pleiades.or.jp>
 <1994Aug23.014415.8857@kubotaj.tt.kubota.co.jp>
Mime-Version: 1.0
Date: Tue, 23 Aug 1994 04:33:36 GMT
Lines: 155
Xref: galaxy.trc.rwcp.or.jp fj.sources:3557 fj.sources.d:2515
X-originally-archived-at: http://galaxy.rwcp.or.jp/text/cgi-bin/newsarticle2?ng=fj.sources.d&nb=2515&hd=a
X-reformat-date: Mon, 18 Oct 2004 15:18:22 +0900
X-reformat-comment: Tabs were expanded into 4 column tabstops by the Galaxy's archiver. See http://katsu.watanabe.name/ancientfj/galaxy-format.html for more info.


In article <1994Aug22.042752.16726@merope.pleiades.or.jp> you writes:
   > 
   > $B$=$N$^$^(Bmake$B$7$?$i!"(B
   > $B>#>$>%>&>'>(>)>*>+>,>->.>/>0>1>2>3>4>5>6>7>8>9>:>;><>=>>(B
   > $B$N$h$&$J%U%!%$%k$,@5>o$KI=<($G$-$^$;$s$G$7$?!#(B

$B$O$!!"(B1pass$B$G$G$-$k%3!<%I$N<+F0H=JL$7$+$7$F$^$;$s$+$i!#(B

$B$H8@$C$F$bJ9$+$J$$?M$OB?$$$h$&$J$N$G%Q%C%A$r:n$j$^$7$?!#(B

In file "README.j":
 - UJIS$B!"(BSJIS$B$NN>J}$r<h$j07$&>l9g$O!"$=$NIQEY$K9g$o$;$F!"(B
   defines.h$BCf$G(BSJIS_PRE$B$r(B1$B$K$7$?$j(B0$B$K$7$F;H$C$F2<$5$$!#(B

$B$3$N(BSJIS_PRE$B$r(B1$B$K$7$F$*$/$H!"(BEUC$B$N%+%?%+%J!"Jd=u4A;z$b$9$Y$F(B
SJIS$B$H;W$C$F=PNO$7$A$c$$$^$9$,!"LdBjL5$$$J$i;H$C$F2<$5$$!#$"(B
$B$H(BSJIS$B$N%+%?%+%J$b<+F0H=JL$7$J$,$i$G$bI=<($G$-$k$h$&$K$J$j$^(B
$B$9!#(B

MSDOS$BHG$G%4%=%4%=$9$k>l9g$O(B1$B$K$7$H$$$?$[$&$,$$$$$h$&$J5$$,$7(B
$B$F$$$^$9!#(B

# $B$o$?$7$c$3$s$JFC<l$J%3!<%I$@$1$N%U%!%$%k$J$s$F?($i$J$$$+$i!"(B
# $B:FI=<($5$;$k<j4V$,$+$+$C$F$bJd=u4A;z$J$s$+$,=P$?$[$&$,$$$$(B
# $B$7!"85!9(BSJIS$B$b7y$$$J$s$G%G%#%U%)%k%H$O(B0$B$G$9!#(B

In article <1994Aug23.014415.8857@kubotaj.tt.kubota.co.jp> you writes:
   > 
   > Kusakabe Youichi (void@merope.pleiades.or.jp) wrote:
   > : ShifttJIS$B$J$I$H$$$&<Y0-$J(B(^^)$B4D6-$G$b;H$($k$h$&$K$9$k$K$O!"(B
   > : $B$I$3$r$I$&$d$C$F$+$i(Bmake$B$9$l$P$$$$$N$+$4B8$8$NJ}65$($F$/$@$5$$!#(B
   > 
   >   $B$H$j$"$($:4D6-JQ?t(B LANG $B$r(B ja_JP.SJIS $B$K$7$F$_$F2<$5$$!#(B
   >   EUC $B4D6-$N;~$O(B ja_JP.EUC$B$G$9!#(B

$B$&!A$s!"$3$l$G$b<+F0H=JL$r$7$F$7$^$&$N$GBLL\$G$9!#(B
LESSCHARSET$B$r(Bsjis$B$K$7$J$$$HBLL\$G$9$M!#(B

   >   $B$H$3$m$G!"F|K\8l(B DEC OSF/1$B$N(B locale $B$K$O(B ja_JP.EUC$B$O$J$/!"(B
   > ja_JP.eucJP $B$K$J$C$F$$$F!"$3$N@_Dj$N$^$^(Bless-205-iso2022$B$r(B
   > kterm $B>e$G;H$&$H$J$+$J$+3Z$7$$$3$H$K$J$j$^$9!#(B
   >   $B;d$O!"4]@n$5$s$N%"%I%P%$%9$G(B charset.c$B$r$$$8$C$FBP1~$5$;(B
   > $B$^$7$?$,!"3'$5$s$b$4Cm0U2<$5$$!#(B

$B5!<o0MB8$N(Blocale$B$b!"(BDEC OSF/1$B$H(BBSDI$BMQ$N$@$12C$($F$*$-$^$7$?!#(B

ftp://ftp.aist-nara.ac.jp/pub/misc/less/less-205-iso2022-patch.p1.gz
$B$K$bCV$$$F$*$-$^$9!#(B

--- $B$+$:$7(B

diff -u less/README.j:1.2 less/README.j:1.3
--- less/README.j:1.2Tue Aug 23 11:50:55 1994
+++ less/README.jTue Aug 23 11:50:55 1994
@@ -16,6 +16,8 @@
  - ISO 2022$B$N(B4$BLL$"$kLL$N=i4|@_Dj$rA*Br$G$-$k$h$&$K$7$?!#(B
  - ISO 2022$B$N%U%#%k%?$H$7$F$bF0:n$9$k$?$a$N%*%W%7%g%s(B-F$B$rDI(B
    $B2C$7$?!#(B
+ - UJIS$B!"(BSJIS$B$NN>J}$r<h$j07$&>l9g$O!"$=$NIQEY$K9g$o$;$F!"(B
+   defines.h$BCf$G(BSJIS_PRE$B$r(B1$B$K$7$?$j(B0$B$K$7$F;H$C$F2<$5$$!#(B
 
 **less$B$NF|K\8l2=$d4XO"$7$?%Q%C%A$NNr;K(B**
  - In fj.sources.
diff -u less/charset.c:1.26 less/charset.c:1.27
--- less/charset.c:1.26Tue Aug 23 11:50:56 1994
+++ less/charset.cTue Aug 23 11:50:56 1994
@@ -100,6 +100,11 @@
 { "Japan","japanese-ujis"},
 { "japanese","japanese-ujis"},
 { "Japanese","japanese-ujis"},
+/* Other local locales */
+{ "ja_JP.eucJP","japanese-ujis"},
+{ "ja_JP.deckanji","japanese-ujis"},
+{ "ja_JP.sdeckanji","japanese-ujis"},
+{ "Japanese-EUC","japanese-ujis"},
 #  endif
 # endif
 { NULL }
diff -u less/defines.h.in:1.11 less/defines.h.in:1.12
--- less/defines.h.in:1.11Tue Aug 23 11:50:57 1994
+++ less/defines.h.inTue Aug 23 11:50:57 1994
@@ -134,9 +134,10 @@
 #endif
 
 /*
- * SJISKANA is 1 if you always want to use SJIS KANA code as Japanese
+ * SJIS is 1 if you always want to give a preference for SJIS to EUC.
+ * All codes looks like SJIS is treated as SJIS.
  */
-#defineSJISKANA0
+#defineSJIS_PRE0
 
 /*
  * LANG is 1 if you want to use LANG envrionment variable to
diff -u less/defines.h.top:1.11 less/defines.h.top:1.12
--- less/defines.h.top:1.11Tue Aug 23 11:50:58 1994
+++ less/defines.h.topTue Aug 23 11:50:58 1994
@@ -133,9 +133,10 @@
 #endif
 
 /*
- * SJISKANA is 1 if you always want to use SJIS KANA code as Japanese
+ * SJIS is 1 if you always want to give a preference for SJIS to EUC.
+ * All codes looks like SJIS is treated as SJIS.
  */
-#defineSJISKANA0
+#defineSJIS_PRE0
 
 /*
  * LANG is 1 if you want to use LANG envrionment variable to
diff -u less/multi.c:1.39 less/multi.c:1.40
--- less/multi.c:1.39Tue Aug 23 11:50:59 1994
+++ less/multi.cTue Aug 23 11:50:59 1994
@@ -40,6 +40,7 @@
 #define ISUJISSS(c)((c) == 0x8e || (c) == 0x8f)
 #define ISUJISKANJI(c1,c2)(ISUJIS(c1) && ISUJIS(c2))
 #define ISUJISKANA(c1,c2)((c1) == 0x8e && ISUJIS(c2))
+#define ISUJISKANA1(c)((c) == 0x8e)
 #define ISUJISKANJISUP(c1,c2,c3) ((c1) == 0x8f && ISUJIS(c2) && ISUJIS(c3))
 #define ISSJISKANJI(c1,c2)(((0x81 <= (c1) && (c1) <= 0x9f) || \
   (0xe0 <= (c1) && (c1) <= 0xfc)) && \
@@ -478,10 +479,10 @@
 return (WRONGONE);
 }
 #if JAPANESE
-#if !SJISKANA
-if (!read_all_kanji && read_sjis && ISSJISKANA(c))
-#else
+#if SJIS_PRE
 if (!first_ujis && read_sjis && ISSJISKANA(c))
+#else
+if (!read_all_kanji && read_sjis && ISSJISKANA(c))
 #endif
 {
 disp = JISX0201KANA;
@@ -511,10 +512,17 @@
 return (WRONG);
 }
 #if JAPANESE
+#if SJIS_PRE
+if (read_sjis && multiindex == 2 &&
+    ISSJISKANJI(multibuf[0], c) &&
+    (!first_ujis || !ISUJIS(c) || !ISUJIS(multibuf[0])))
+#else
 if (read_sjis && multiindex == 2 &&
     ISSJISKANJI(multibuf[0], c) &&
     (!first_ujis || !ISUJIS(c) ||
-     (!ISUJIS(multibuf[0]) && !ISUJISSS(multibuf[0]))))
+     (output_sjis ? !ISUJIS(multibuf[0]) && !ISUJISKANA1(multibuf[0]) :
+    !ISUJIS(multibuf[0]) && !ISUJISSS(multibuf[0]))))
+#endif
 {
 disp = JISX0208KANJI;
 first_ujis = 0;
