Re: [Groff] Regression test suite

[Mark Veltzer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Tuesday 20 August 2002 17:17, you wrote:
> Hi Mark and Werner,
>
> here is another patch for post-grohtml which fixes the bug exhibited
> when a .bp was encountered. Basically the (grohtml) pageoffset value
> was incorrectly reset on the 2nd and subsequent pages.
>
> Thus the javah.1 manual page now looks better (another candidate for the
> grohtml regression suite).
>
> I've also tidied up the creation comment, which is now positioned at the
> top of the html document.

Excellent. Are all the patches in CVS ? (I'm starting to get mixed up with 
which patches I applied and which I didn't). Please let me know when I can 
pull CVS and test it. I'll continue importing (my aim is to convert ALL 
manual pages on my system (about 6000 of those) to every format. So I'm quite 
sure I'll bug you some more.

Mark

>
> Gaius
>
> ps. btw the ftp copy of groff is out of date w.r.t the CVS repository,
>     not a major problem but I thought I'd mention it so others will
>     know to retrieve groff via the cvs command and not ftp.
>
> --- groff-cvs/src/devices/grohtml/post-html.cc        Sun Aug 18 11:25:21 2002
> +++ groff-html/src/devices/grohtml/post-html.cc       Tue Aug 20 15:04:07 2002
> @@ -57,6 +57,7 @@
>                                                       /* either encoded by
> their glyph names or if */ /* there is no name then we use &#nnn;       */
> typedef enum {CENTERED, LEFT, RIGHT, INLINE} TAG_ALIGNMENT;
> +typedef enum {col_tag, tab_tag, tab0_tag, none} colType;
>
>  #undef DEBUG_TABLES
>
> @@ -1553,6 +1554,8 @@
>    void calc_po_in                     (text_glob *g, int nf);
>    void remove_tabs                    (void);
>    void remove_courier_tabs            (void);
> +  void update_min_max                 (colType type_of_col, int *minimum,
> int *maximum, text_glob *g); +  void add_table_end                  (char
> *debug_string);
>    // ADD HERE
>
>  public:
> @@ -2233,6 +2236,7 @@
>      current_paragraph->done_para();
>
>      html.simple_comment("TABS");
> +
>      t->set_linelength(max_linelength);
>      t->add_indent(pageoffset);
>      t->emit_table_header(need_space);
> @@ -2657,6 +2661,43 @@
>  }
>
>  /*
> + *  update_min_max - updates the extent of a column, given the left and
> right + *                   extents of a glyph, g.
> + */
> +
> +void html_printer::update_min_max (colType type_of_col, int *minimum, int
> *maximum, text_glob *g) +{
> +  switch (type_of_col) {
> +
> +  case tab_tag:
> +    break;
> +  case tab0_tag:
> +    *minimum = g->minh;
> +    break;
> +  case col_tag:
> +    *minimum = g->minh;
> +    *maximum = g->maxh;
> +    break;
> +  default:
> +    break;
> +  }
> +}
> +
> +/*
> + *  add_table_end - moves left one glyph, adds a table end tag and adds a
> + *                  debugging string.
> + */
> +
> +void html_printer::add_table_end (char *debug_string)
> +{
> +  page_contents->glyphs.move_left();
> +  insert_tab_te();
> +#if defined(DEBUG_TABLES)
> +  page_contents->insert_tag(string(debug_string));
> +#endif
> +}
> +
> +/*
>   *  lookahead_for_tables - checks for .col tags and inserts table
> start/end tags */
>
> @@ -2666,7 +2707,7 @@
>    text_glob  *start_of_line  = NULL;
>    text_glob  *start_of_table = NULL;
>    text_glob  *last           = NULL;
> -  enum {col_tag, tab_tag, tab0_tag, none} type_of_col = none;
> +  colType     type_of_col    = none;
>    int         left           = 0;
>    int         found_col      = FALSE;
>    int         seen_text      = FALSE;
> @@ -2677,6 +2718,7 @@
>    const char *tab_defs       = NULL;
>    char        align          = 'L';
>    int         nf             = FALSE;
> +  int         old_pageoffset = pageoffset;
>
>    remove_courier_tabs();
>    page_contents->dump_page();
> @@ -2741,22 +2783,8 @@
>       ncol = 1;
>       colmin = 0;
>       colmax = table->get_tab_pos(2) + pageoffset + indentation;
> -      } else if (! g->is_a_tag()) {
> -     switch (type_of_col) {
> -
> -     case tab_tag:
> -       break;
> -     case tab0_tag:
> -       colmin = g->minh;
> -       break;
> -     case col_tag:
> -       colmin = g->minh;
> -       colmax = g->maxh;
> -       break;
> -     default:
> -       break;
> -     }
> -      }
> +      } else if (! g->is_a_tag())
> +     update_min_max(type_of_col, &colmin, &colmax, g);
>
>        if ((! g->is_a_tag()) || g->is_tab())
>       seen_text = TRUE;
> @@ -2767,21 +2795,17 @@
>       start_of_line = NULL;
>       seen_text = FALSE;
>        } else if (g->is_ce() && (start_of_table != NULL)) {
> -     page_contents->glyphs.move_left();
> -     insert_tab_te();
> +     add_table_end("*** CE ***");
>       start_of_table->remember_table(table);
> -     page_contents->insert_tag(string("*** CE ***"));
>       start_of_table = NULL;
>       last = NULL;
>        } else if (g->is_ta()) {
>       tab_defs = g->text_string;
>       if (!table->tab_stops->compatible(tab_defs)) {
>         if (start_of_table != NULL) {
> -         page_contents->glyphs.move_left();
> -         insert_tab_te();
> +         add_table_end("*** TABS ***");
>           start_of_table->remember_table(table);
>           table = new html_table(&html, -1);
> -         page_contents->insert_tag(string("*** TABS ***"));
>           start_of_table = NULL;
>           type_of_col = none;
>           last = NULL;
> @@ -2793,14 +2817,11 @@
>        if (((! g->is_a_tag()) || g->is_tab()) && (start_of_table != NULL))
> { // we are in a table and have a glyph
>       if ((ncol == 0) || (! table->add_column(ncol, colmin, colmax, align))) {
> -       page_contents->glyphs.move_left();
> -       insert_tab_te();
> -#if defined(DEBUG_TABLES)
>         if (ncol == 0)
> -         page_contents->insert_tag(string("*** NCOL == 0 ***"));
> +         add_table_end("*** NCOL == 0 ***");
>         else
> -         page_contents->insert_tag(string("*** CROSSED COLS ***"));
> -#endif
> +         add_table_end("*** CROSSED COLS ***");
> +
>         start_of_table->remember_table(table);
>         table = new html_table(&html, -1);
>         start_of_table = NULL;
> @@ -2814,7 +2835,13 @@
>         */
>        g = page_contents->glyphs.move_right_get_data();
>
> -      if (g != NULL && (g->is_br_ni() || (nf && g->is_eol()))) {
> +      if (g == NULL) {
> +     if (found_col) {
> +       page_contents->glyphs.start_from_head();
> +       last = g;
> +       found_col = FALSE;
> +     }
> +      } else if (g->is_br_ni() || (nf && g->is_eol())) {
>       do {
>         g = page_contents->glyphs.move_right_get_data();
>         nf = calc_nf(g, nf);
> @@ -2849,8 +2876,7 @@
>      delete table;
>
>    // and reset the registers
> -  pageoffset = 0;
> -  pageoffset = 0;
> +  pageoffset = old_pageoffset;
>    indentation = 0;
>    prev_indent = 0;
>    end_tempindent = 0;
> @@ -2869,6 +2895,11 @@
>
>    // move onto a new page
>    delete page_contents;
> +#if defined(DEBUG_TABLES)
> +  fprintf(stderr, "\n\n*** flushed page ***\n\n");
> +
> +  html.simple_comment("new page called");
> +#endif
>    page_contents = new page;
>  }
>
> @@ -3527,9 +3558,26 @@
>
>  html_printer::~html_printer()
>  {
> +#ifdef LONG_FOR_TIME_T
> +  long t;
> +#else
> +  time_t t;
> +#endif
> +
>    current_paragraph->flush_text();
>    html.end_line();
>    html.set_file(stdout);
> +  html.begin_comment("Creator     : ")
> +    .put_string("groff ")
> +    .put_string("version ")
> +    .put_string(Version_string)
> +    .end_comment();
> +
> +  t = time(0);
> +  html.begin_comment("CreationDate: ")
> +    .put_string(ctime(&t), strlen(ctime(&t))-1)
> +    .end_comment();
> +
>    /*
>     *  'HTML: The definitive guide', O'Reilly, p47. advises against
> specifying *         the dtd, so for the moment I'll leave this commented
> out. @@ -3549,24 +3597,6 @@
>    write_title(FALSE);
>    header.write_headings(stdout, FALSE);
>    write_rule();
> -  {
> -    html.begin_comment("Creator     : ")
> -       .put_string("groff ")
> -       .put_string("version ")
> -       .put_string(Version_string)
> -       .end_comment();
> -  }
> -  {
> -#ifdef LONG_FOR_TIME_T
> -    long
> -#else
> -    time_t
> -#endif
> -    t = time(0);
> -    html.begin_comment("CreationDate: ")
> -      .put_string(ctime(&t), strlen(ctime(&t))-1)
> -      .end_comment();
> -  }
>  #if defined(DEBUGGING)
>    html.begin_comment("Total number of pages:
> ").put_string(i_to_a(no_of_printed_pages)).end_comment(); #endif

- -- 
Name: Mark Veltzer
Title: Research and Development
Company: Meta Ltd.
Address: Habikaa 17/3, Kiriat Sharet
City: Holon
Zip code: 58495
County: Gush-Dan
Country: Israel
Home Phone: +972-3-5508163
Business Phone: +972-3-5508163
Extension: none
Fax: +972-3-5508163
Mobile: none
Email: mailto:address@hidden
Homepage: http://www.veltzer.org
Icq: 25787273
Aol: mark2776
Yahoo: mark2776
Jabber: mark2776
CPAN id: VELTZER (http://cpan.org, mailto:address@hidden)
SourceForge id: veltzer (http://www.sourceforge.net, 
mailto:address@hidden)
Advogato id: veltzer (http://www.advogato.org, mailto:address@hidden)
Refer to http://pgp.ai.mit.edu  or any PGP keyserver for public key.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9YkauxlxDIcceXTgRArdWAKDYMRq/XCJTEEETgiW+m7DOLdR1ogCg4vPH
11zOjKUpfIGSEpEoYpQGrK4=
=gbc4
-----END PGP SIGNATURE-----