Index: w3m/file.c diff -u w3m/file.c:1.6 w3m/file.c:1.7 --- w3m/file.c:1.6 Mon Sep 4 20:37:25 2000 +++ w3m/file.c Wed Sep 6 23:19:28 2000 @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.6 2000/09/04 11:37:25 okabe Exp $ */ +/* $Id: file.c,v 1.7 2000/09/06 14:19:28 okabe Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -1594,9 +1594,10 @@ pushText(buf, line->ptr); else fprintf(f, "%s\n", line->ptr); - h_env->lnum++; if (obuf->flag & RB_SPECIAL || obuf->flag & RB_NFLUSHED) - h_env->lnum_non_blank = h_env->lnum; + h_env->blank_lines = 0; + else + h_env->blank_lines++; } else { char *p = line->ptr; @@ -1681,7 +1682,7 @@ TextList *buf = h_env->buf; FILE *f = h_env->f; - if (buf && h_env->lnum_non_blank == h_env->lnum) + if (buf && h_env->blank_lines == 0) flushline(h_env, obuf, indent, 1, width); else if (f) flushline(h_env, obuf, indent, 1, width); @@ -1695,7 +1696,7 @@ Str tmp; int status, pre; - if (h_env->buf == NULL || h_env->lnum_non_blank == h_env->lnum) + if (h_env->buf == NULL || h_env->blank_lines == 0) return; status = R_ST_NORMAL; @@ -1706,7 +1707,7 @@ if (tmp->ptr[0] == '<') appendText(h_env->buf ,tmp->ptr); } - h_env->lnum--; + h_env->blank_lines--; } static int @@ -2621,7 +2622,7 @@ return 1; case HTML_BR: flushline(h_env, obuf, envs[h_env->envc].indent, 1, h_env->limit); - h_env->lnum_non_blank = h_env->lnum; + h_env->blank_lines = 0; return 1; case HTML_EOL: if ((obuf->flag & RB_PREMODE) && obuf->pos > envs[h_env->envc].indent) @@ -4624,7 +4625,7 @@ h_env->envc = 0; h_env->envc_real = 0; h_env->title = NULL; - h_env->lnum = h_env->lnum_non_blank = 0; + h_env->blank_lines = 0; } void Index: w3m/fm.h diff -u w3m/fm.h:1.2 w3m/fm.h:1.3 --- w3m/fm.h:1.2 Mon Sep 4 20:37:26 2000 +++ w3m/fm.h Wed Sep 6 23:19:29 2000 @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.2 2000/09/04 11:37:26 okabe Exp $ */ +/* $Id: fm.h,v 1.3 2000/09/06 14:19:29 okabe Exp $ */ /* * w3m: WWW wo Miru utility * @@ -450,8 +450,7 @@ int envc; int envc_real; char *title; - long lnum; - long lnum_non_blank; + int blank_lines; }; struct auth_cookie { Index: w3m/table.c diff -u w3m/table.c:1.6 w3m/table.c:1.7 --- w3m/table.c:1.6 Mon Sep 4 20:37:27 2000 +++ w3m/table.c Wed Sep 6 23:19:29 2000 @@ -1,4 +1,4 @@ -/* $Id: table.c,v 1.6 2000/09/04 11:37:27 okabe Exp $ */ +/* $Id: table.c,v 1.7 2000/09/06 14:19:29 okabe Exp $ */ /* * HTML table */ @@ -845,8 +845,7 @@ } restore_fonteffect(&h_env, h_env.obuf); obuf.flag &= ~RB_IGNORE_P; - h_env.lnum += t->total_height; - h_env.lnum_non_blank = h_env.lnum; + h_env.blank_lines = 0; #ifdef TABLE_VSPACE if (t->vspace > 0) { do_blankline(&h_env, &obuf, 0, 0, h_env.limit);