[Groff] Re: html.cc patch

[Gaius Mulley]

Hi Werner,

Werner wrote:
> Please check it again -- if it is OK, I will release the groff package.

Yes there was a patch missing - it is here,
Thanks for tidying up the manual page and ChangeLog.

cheers Gaius


diff -r -c groff/grohtml/html.cc groff.cvs/grohtml/html.cc
*** groff/grohtml/html.cc       Tue Dec 14 17:17:08 1999
--- groff.cvs/grohtml/html.cc   Mon Dec 13 21:10:37 1999
***************
*** 1609,1618 ****
      int r        = font::res;
      int height   = output_style.point_size*r/72;
  
!     if (output_vpos >=0) {
!       // we leave it alone if it is set to the top of page
!       output_vpos += height;
!     }
      need_paragraph = TRUE;   // delay the <p> just in case we don't actually 
emit text
      in_paragraph   = TRUE;
      issued_newline = TRUE;
--- 1609,1615 ----
      int r        = font::res;
      int height   = output_style.point_size*r/72;
  
!     output_vpos += height;
      need_paragraph = TRUE;   // delay the <p> just in case we don't actually 
emit text
      in_paragraph   = TRUE;
      issued_newline = TRUE;
***************
*** 1682,1690 ****
        w = page_contents->words.get_data();
        if ((w->maxh >= 0) && (w->maxh > right_margin_indent)) {
          right_margin_indent = w->maxh;
- #if 0
          if (right_margin_indent == 950) stop();
- #endif
        }
        page_contents->words.move_right();
        } while (! page_contents->words.is_equal_to_head());
--- 1679,1685 ----
***************
*** 1697,1705 ****
        g = page_contents->lines.get_data();
        if ((g->maxh >= 0) && (g->maxh > right_margin_indent)) {
          right_margin_indent = g->maxh;
- #if 0
          if (right_margin_indent == 950) stop();
- #endif
        }
        page_contents->lines.move_right();
        } while (! page_contents->lines.is_equal_to_head());
--- 1692,1698 ----
***************
*** 2737,2746 ****
  
  int html_printer::is_on_same_line (text_glob *g, int vpos)
  {
!   return(
!        (vpos >= 0) &&
!        is_intersection(vpos, vpos+g->text_style.point_size*font::res/72-1, 
g->minv, g->maxv)
!         );
  }
  
  
--- 2730,2736 ----
  
  int html_printer::is_on_same_line (text_glob *g, int vpos)
  {
!   return( is_intersection(vpos, vpos+g->text_style.point_size*font::res/72-1, 
g->minv, g->maxv) );
  }
  
  
***************
*** 3469,3475 ****
    int                limit;
  
  #if 0
!   if (strcmp(start->text_string, "man") == 0) {
      stop();
    }
  #endif
--- 3459,3465 ----
    int                limit;
  
  #if 0
!   if (strcmp(start->text_string, "Xigure") == 0) {
      stop();
    }
  #endif
***************
*** 3594,3600 ****
    rewind_text_to(start);
  
    i = count_columns(last_guess);
!   if (((lines > 2) && ((i>1) || (continue_searching_column(last_guess, 
last_guess, all_words)))) ||
        ((lines == 1) && (large_enough_gap(last_guess)))) {
      // copy match into permenant html_table
  
--- 3584,3590 ----
    rewind_text_to(start);
  
    i = count_columns(last_guess);
!   if (((lines > 1) && ((i>1) || (continue_searching_column(last_guess, 
last_guess, all_words)))) ||
        ((lines == 1) && (large_enough_gap(last_guess)))) {
      // copy match into permenant html_table