[w3m-dev 01544] Re: <P> in <DL>

From: Yamate Keiichirou (yamate@ebina.hitachi.co.jp)
Date: Wed Dec 20 2000 - 06:40:44 CST

  • Next message: Hironori Sakamoto: "[w3m-dev 01545] Re: <P> in <DL>"

      $B$d$^$F$G$9!#(B

      <a title=">

      $B$G$9$,!";W$C$?DL$j(Bframe$B$G$bJQ$J5sF0$r$7$^$9!#$G!"Cn<h$j$r$7$F$$$?$i!"(B
    $B$D$$$G$K(B <head>, <title>, <a target=""> $BEy!9$NA`:n$r$7$F$$$J$$$H$$$&Cn(B
    $B$b8+$D$1$^$7$?$s$G!"$I$A$i$b$J$*$7$?>e$GJQ?tL$=i4|2=(Bwarning$B$b$J$/$J$k(B
    $B%Q%C%A$r$D$1$^$9!#(B

      $B$b$7!"$3$3(B6$B%v7n$[$I$N4V$K!"(BcreateFrameFile$B=hM}Cf$N3F<o(Btag$B%3%a%s%H%"(B
    $B%&%HEy$N=hM}$rM}M3$,$"$C$F30$7$?$N$G$"$l$P!"65$($F$/$@$5$$!#(B

      $B!D!D$b$&0lEY=q$$$F$_$F;W$$$^$9$,!"$3$N(Bswitch$BJ8$C$F1x$$$G$9$M!#(B
    read_token()$B$N6a$/$K$*$$$?J}$,:B$j$,$h$5$=$&$G$9!#(B 

    ---
long jump$BJQ?tF'$_E]$7(Bwarning$B$r=P$5$J$$%*%W%7%g%s$C$F2?$@$C$1!D!D(B
$B$d$^$F(B

    diff -rC2 -x *[^.]? -x *.[^ch] w3m-m17n-0.4-orig/frame.c w3m-m17n-0.4/frame.c *** w3m-m17n-0.4-orig/frame.c Wed Dec 20 19:21:40 2000 --- w3m-m17n-0.4/frame.c Wed Dec 20 20:53:39 2000 *************** *** 421,425 **** int r, c, status, t_stack; InputStream f2; - Str tmp, tok; #ifdef USE_M17N wc_ccs charset, doc_charset; --- 421,424 ---- *************** *** 461,465 **** currentURL = f->currentURL ? f->currentURL : &current->currentURL; - tok = Strnew(); status = R_ST_NORMAL; for (r = 0; r < f->row; r++) { --- 460,463 ---- *************** *** 534,547 **** #endif t_stack = 0; ! while (1) { do { if (*p == '\0') { ! tmp = StrmyISgets(f2); ! if (tmp->length == 0) ! break; #ifdef USE_M17N tmp = wc_Str_conv_with_detect(tmp, &charset, doc_charset, InnerCharset); - #endif cleanup_line(tmp, HTML_MODE); --- 532,578 ---- #endif t_stack = 0; ! do { ! Str tok = Strnew(); do { if (*p == '\0') { ! Str tmp; ! if (is_eos(f2)) { ! tmp = Strnew(); ! ! switch (status) { ! case R_ST_CMNT: /* required "-->" */ ! Strcat_char(tmp, '-'); ! case R_ST_NCMNT1: /* required "->" */ ! Strcat_char(tmp, '-'); ! case R_ST_NCMNT2: ! case R_ST_NCMNT3: ! case R_ST_IRRTAG: ! case R_ST_CMNT1: ! case R_ST_CMNT2: ! case R_ST_TAG: ! case R_ST_TAG0: ! case R_ST_EQL: /* required ">" */ ! Strcat_char(tmp, '>'); ! break; ! case R_ST_QUOTE: ! Strcat_char(tmp, '\''); ! break; ! case R_ST_DQUOTE: ! Strcat_char(tmp, '"'); ! break; ! case R_ST_AMP: ! Strcat_char(tmp, ';'); ! break; ! default: ! tok = Strnew(); ! status = R_ST_NORMAL; ! case R_ST_NORMAL: ! break; ! } ! } else ! tmp = StrmyISgets(f2); #ifdef USE_M17N tmp = wc_Str_conv_with_detect(tmp, &charset, doc_charset, InnerCharset); #endif cleanup_line(tmp, HTML_MODE); *************** *** 559,563 **** if (tok->length > 0 && tok->ptr[0] == '<') { char *q = tok->ptr; ! int cmd, j, is_anchor = 0, a_target = 0; struct parsed_tag *tag; ParsedURL url; --- 590,594 ---- if (tok->length > 0 && tok->ptr[0] == '<') { char *q = tok->ptr; ! int j, is_anchor = 0, a_target = 0; struct parsed_tag *tag; ParsedURL url; *************** *** 566,570 **** goto token_end; ! switch (cmd) { case HTML_TITLE: fputs("<!-- title:", f1); --- 597,601 ---- goto token_end; ! switch (tag->tagid) { case HTML_TITLE: fputs("<!-- title:", f1); *************** *** 733,740 **** } token_end: - if (tmp->length == 0) - break; Strclear(tok); ! } while (t_stack--) fputs("</TABLE>\n", f1); --- 764,769 ---- } token_end: Strclear(tok); ! } while (*p != '\0' || !is_eos(f2)); while (t_stack--) fputs("</TABLE>\n", f1);

    This archive was generated by hypermail 2b29 : Wed Dec 20 2000 - 06:48:01 CST