Re: integrate tbl into mandoc

[Ingo Schwarze <schwarze@usta.de>]

Hi,

>> The following still crash:

as one might expect, options are optional,
so the following patch fixes most of these.

The following now work:

  /usr/src/lib/libcurses/curs_addch.3tbl
  /usr/src/lib/libcurses/curs_attr.3tbl
  /usr/src/lib/libcurses/curs_getch.3tbl
  /usr/src/lib/libcurses/curs_mouse.3tbl
  /usr/src/lib/libcurses/curses.3tbl
  /usr/src/lib/libform/form.3tbl
  /usr/src/usr.bin/infocmp/infocmp.1tbl
  /usr/src/usr.bin/tic/captoinfo.1tbl

These still crash:

>>   /usr/src/lib/libcurses/curs_inch.3tbl
>>   /usr/src/lib/libmenu/menu.3tbl
>>   /usr/src/gnu/usr.sbin/mkhybrid/src/mkhybrid.8tbl

>> The following have a tbl extension, but no .TS:
>>   /usr/src/lib/libcurses/term.5tbl
>> The following are mdoc(7) with tbl:
>>   /usr/src/share/man/man4/wi.4tbl
>>   /usr/src/share/man/man4/man4.hppa/cpu.4tbl
>>   /usr/src/games/phantasia/phantasia.6tbl

Yours,
  Ingo

diff -Napur mandoc-tbl-calc/tbl_option.c mandoc-tbl/tbl_option.c
--- mandoc-tbl-calc/tbl_option.c	Thu Oct 14 23:24:14 2010
+++ mandoc-tbl/tbl_option.c	Fri Oct 15 00:11:52 2010
@@ -141,6 +141,11 @@ opt(struct tbl *tbl, const char *f, int ln, const char
 {
 	int		 i, sv;
 
+	if (NULL == strchr(p + *pos, ';')) {
+		tbl->part = TBL_PART_LAYOUT;
+		return(1);
+	}
+
 again:
 	sv = *pos;
 
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv