[w3m-dev 01382] Re: w3mmee -T text/plain (Re: Re: $B!=( on w3mmee-0.1.11p13-4)

From: Kiyokazu SUTO (suto@ks-and-ks.ne.jp)
Date: Thu Nov 23 2000 - 06:29:28 CST

  • Next message: Okabe Katsuya: "[w3m-dev 01383] Re: w3m-0.1.11-pre-kokb20 patch"

    Citation (with leading "> " of each line) from article:
      <87pujnmah9.wl@lichee.ukai.org>
        by Fumitoshi UKAI <ukai@debian.or.jp> :
    > % echo '$BF,$rA_$-$`$7$k(B' | LANG=ja_JP.eucJP w3mmee -T text/plain | cat
    > ($B$+$($C$F$-$^$;$s(B)
    >
    > % echo '$BF,$rA_$-$`$7$k(B' | LANG=ja_JP.eucJP w3mmee -T text/plain
    >
    > Viewing <*stream*> No Line
    >
    > $B$H$J$C$F(B 'v' $B$9$k$H(B
    >
    > AE$B!q(BI`~$B!q(Bdho`A'ss~$B!q(Bdh-~$B!q(Bdha`~$B!q(Bdh!|~$B!q(Bdhe
    >
    > $B$5$i$K(B 'v' $B$9$k$H(B
    >
    > AE$B"L(B o`A'ss - a` $B!&(B e
    >
    > $B$N$h$&$K8+$($^$9!#(B

    $B%3%^%s%I%i%$%s$N0z?t$,L5$/$FI8=`F~NO$,C<Kv$8$c$J$$>l9g$K:G=*E*$K8F$P$l(B
    $B$k(BgetNextPage$B$NCf$G!"!V(Bplen$B!W$H=q$/$Y$-$H$3$m$r!V(Blen$B!W$H=q$$$F$$$?$?$a(B
    $B$K%k!<%W$N=*N;>r7o$,@5$7$/I>2A$5$l$F$$$^$;$s$G$7$?!#(B

    $B"-$K(Bp13-4$B$+$i$N%Q%C%A$rE:IU$7$^$9!#(B

    # $B%5%]!<%H%i%$%V%i%j$b%P!<%8%g%s%"%C%W$NI,MW$,$"$j$^$9$,!":9J,$,(B300KB
    # $B$H5pBg$K$J$C$F$7$^$C$?$N$G!";d$N(BWeb$B%Z!<%87PM3$G$I$&$>!#(Bw3mmee$B$N$[$&(B
    # $B$b(BWeb$B%Z!<%87PM3$G<h$l$kJ,$O=$@5HG$K$J$C$F$$$^$9!#(B

    -- 
    $B?\F#(B $B@60l(B <suto@ks-and-ks.ne.jp>
    http://pub.ks-and-ks.ne.jp/pgp-public-key.html
    

    diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/ChangeLog w3mmee-0.1.11p13-7/ChangeLog --- w3mmee-0.1.11p13-4/ChangeLog Tue Nov 21 22:15:25 2000 +++ w3mmee-0.1.11p13-7/ChangeLog Thu Nov 23 20:53:16 2000 @@ -1,3 +1,24 @@ +Thu Nov 23 04:05:49 2000 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> + + * file.c (getNextPage): Code to check whether end of page or not, + was corrupt by typo (report from Fumitoshi UKAI + <ukai@debian.or.jp>). + + * configure: default directory in which ``mb.h'' resides is + changed to ``/usr/local/include/iso2mb''. + + * conv.c (conv_buffer_cs_detect_end): Charset detector was used + even if it is NULL (report from Fumitoshi UKAI + <ukai@debian.or.jp>). + +Wed Nov 22 17:53:39 2000 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> + + * mailcap.c (mailcapMatch): Include the patch: + http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/200011.month/1372.html + + * w3mconfig.eucjp: Characters in GB 2312 and KS X 1001 are output + as is. + Tue Nov 21 16:50:08 2000 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> * form.c (formUpdateBuffer): Change condition to fix anchor diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/configure w3mmee-0.1.11p13-7/configure --- w3mmee-0.1.11p13-4/configure Tue Nov 21 00:58:01 2000 +++ w3mmee-0.1.11p13-7/configure Thu Nov 23 04:35:22 2000 @@ -407,7 +407,7 @@ then if [ -z "$mb_h_dir" ] then - mb_h_dirs='/usr/local/lib/iso2mb /usr/local/include /usr/include' + mb_h_dirs='/usr/local/include/iso2mb /usr/local/include /usr/include' for dir in $mb_h_dirs do if [ -r $dir/mb.h ] diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/conv.c w3mmee-0.1.11p13-7/conv.c --- w3mmee-0.1.11p13-4/conv.c Tue Nov 21 00:58:01 2000 +++ w3mmee-0.1.11p13-7/conv.c Thu Nov 23 04:12:32 2000 @@ -1018,7 +1018,7 @@ void conv_buffer_cs_detect_end(conv_cs_detector_t *p, const char **p_cs) { - if (!*p_cs) { + if (p->detector.nstats && !*p_cs) { size_t same = 0; size_t i = mb_cs_detector_find_best(&p->detector, &same); @@ -1032,7 +1032,7 @@ if (p->info.io_arg == &p->detector) mb_mkunbound_cs_detector(&p->detector); - if (!p->setup.cs || strcmp(*p_cs, p->setup.cs)) { + if (!p->setup.cs || strcasecmp(*p_cs, p->setup.cs)) { p->setup.cs = *p_cs; mb_setup(&p->info, &p->setup, ""); } @@ -1053,6 +1053,13 @@ p->setup.cs = *p_cs; mb_setup(&p->info, &p->setup, ""); + } + + if (!p->detector.nstats) { + p->mem.s = s->ptr; + p->mem.i = 0; + p->mem.n = s->length; + return conv_info2mbStr(&p->info, s->length); } new_objv(&p->size, p->top, &p->lstack, sizeof(Str), NULL); diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/doc/README.mee w3mmee-0.1.11p13-7/doc/README.mee --- w3mmee-0.1.11p13-4/doc/README.mee Tue Nov 21 22:18:14 2000 +++ w3mmee-0.1.11p13-7/doc/README.mee Thu Nov 23 20:53:21 2000 @@ -41,12 +41,12 @@ make install ; ldconfig -You need the library of version 0.8.0 or higher. +You need the library of version 0.8.1 or higher. Second move to the directory of w3m-0.1.11-pre, and make a directory named "po" if it does not exists. Then apply the patch[*2]: - w3mmee-0.1.11p13-4.diff.gz + w3mmee-0.1.11p13-7.diff.gz which adds multiple character encoding support to w3m. For the sake of safety, you had better to pass the option "-l" (to ingnore difference of white spaces) @@ -77,7 +77,7 @@ ------------------------------------------------------------------------------- [*1] http://pub.ks-and-ks.ne.jp/prog/libiso2mb.shtml -[*2] http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-0.1.11p13-4.diff.gz +[*2] http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-0.1.11p13-7.diff.gz ------------------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/doc-jp/README.mee w3mmee-0.1.11p13-7/doc-jp/README.mee --- w3mmee-0.1.11p13-4/doc-jp/README.mee Tue Nov 21 22:18:14 2000 +++ w3mmee-0.1.11p13-7/doc-jp/README.mee Thu Nov 23 20:53:42 2000 @@ -43,13 +43,13 @@ make install ; ldconfig -$B$H$9$k$@$1$G$h$$$N$G$O$J$$$+$H;W$$$^$9!#$J$*%5%]!<%H%i%$%V%i%j$OI,$:(B0.8.0$B0J9_$N(B +$B$H$9$k$@$1$G$h$$$N$G$O$J$$$+$H;W$$$^$9!#$J$*%5%]!<%H%i%$%V%i%j$OI,$:(B0.8.1$B0J9_$N(B $B$b$N$^$GHG$r>e$2$F2<$5$$!#(B $B<!$K(Bw3m-0.1.11-pre$B$rE83+$7$?%G%#%l%/%H%j$K0\F0$7!"$^$::G=i$K!V(Bpo$B!W$H$$$&%5%V%G%#(B $B%l%/%H%j$r(B($BL5$1$l$P(B)$B:n$j!"$=$N8e$KB?Id9f2=%Q%C%A(B[*2]: - w3mmee-0.1.11p13-4.diff.gz + w3mmee-0.1.11p13-7.diff.gz $B$rEv$F$^$9!#$=$N:](Bpatch$B$K!V(B-l$B!W(B($B6uGr$N0c$$$rL5;k$9$k(B)$B$H$$$&%*%W%7%g%s$rM?$($F$*(B $B$/$N$,L5Fq$@$H;W$$$^$9!#(B @@ -81,7 +81,7 @@ $B(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(B [*1] http://pub.ks-and-ks.ne.jp/prog/libiso2mb.shtml -[*2] http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-0.1.11p13-4.diff.gz +[*2] http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-0.1.11p13-7.diff.gz $B(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(,(B diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/file.c w3mmee-0.1.11p13-7/file.c --- w3mmee-0.1.11p13-4/file.c Tue Nov 21 00:58:01 2000 +++ w3mmee-0.1.11p13-7/file.c Thu Nov 23 20:53:16 2000 @@ -6178,7 +6178,7 @@ #endif ) { #ifdef MANY_CHARSET - if (i >= len) { + if (i >= plen) { if (!code) conv_buffer_cs_detect_end(&detector, &code); diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/mailcap.c w3mmee-0.1.11p13-7/mailcap.c --- w3mmee-0.1.11p13-4/mailcap.c Mon Oct 30 22:48:10 2000 +++ w3mmee-0.1.11p13-7/mailcap.c Wed Nov 22 20:27:48 2000 @@ -55,6 +55,8 @@ p++; type++; } + if (*type != '\0') + return 0; return 20 + level; } diff -urN --exclude=CVS --exclude=*.new w3mmee-0.1.11p13-4/w3mconfig.eucjp w3mmee-0.1.11p13-7/w3mconfig.eucjp --- w3mmee-0.1.11p13-4/w3mconfig.eucjp Tue Nov 21 00:58:03 2000 +++ w3mmee-0.1.11p13-7/w3mconfig.eucjp Wed Nov 22 19:34:35 2000 @@ -26,6 +26,10 @@ tty_accept_character I+100001-102284 # JIS X 0212 tty_accept_character I+200001-202284 +# GB 2312 +tty_accept_character I+80001-82284 +# KS X 1001 +tty_accept_character I+180001-182284 # Right half of Latin1 tty_accept_character U+A0 " "



    This archive was generated by hypermail 2b29 : Thu Nov 23 2000 - 06:40:43 CST