Index: dfilter2sgml
===================================================================
RCS file: /cvsroot/ethereal-doc/dfilter2sgml,v
retrieving revision 1.4
diff -u -r1.4 dfilter2sgml
--- dfilter2sgml	2002/08/18 19:14:14	1.4
+++ dfilter2sgml	2002/08/19 14:01:16
@@ -55,10 +55,10 @@
 	}
 	# Store header field information
 	else {
-		($junk, $name, $abbrev, $type, $parent) =
+		($junk, $name, $abbrev, $type, $parent, $blurb) =
 			split(/\t+/, $_);
 		push(@{$field_abbrev{$parent}}, $abbrev);
-		$field_info{$abbrev} = [ $name, $type ];
+		$field_info{$abbrev} = [ $name, $type, $blurb ];
 	}
 }
 
@@ -99,6 +99,7 @@
 		$ns_proto_name =~ s/\//slash/g;
 		$ns_proto_name =~ s/,/comma/g;
 		$ns_proto_name =~ s/:/colon/g;
+		$ns_proto_name =~ s/'/apos/g;
 		
 		# The maximum token name length is apparently 44 characters. 
 		# That's what NAMELEN is defined as in docbook 4.1, at least.
@@ -112,11 +113,11 @@
 		print "<section id=\"SID$ns_proto_name\"><title>$proto_name ($proto_abbrev{$proto_name})</title>\n\n";
 
 		print "<table id=\"TID$ns_proto_name\"><title>$proto_name ($proto_abbrev{$proto_name})</title>\n";
-		print "<tgroup cols=\"3\">\n";
+		print "<tgroup cols=\"4\">\n";
 #		print "<colspec colnum=\"1\" colwidth=\"80pt\">\n";
 #		print "<colspec colnum=\"2\" colwidth=\"80pt\"\n>";
 		print "<thead>\n  <row>\n    ";
-		print "<entry>Field</entry>\n    <entry>Field Name</entry>\n    <entry>Type</entry>\n\n";
+ 		print "<entry>Field</>\n    <entry>Field Name</>\n    <entry>Type</>\n    <entry>Description</>\n\n";
 
 		print "  </row>\n</thead>\n<tbody>\n";
 
@@ -129,6 +130,7 @@
 			    print "    <entry>$field_abbrev</entry>\n";
 			    print "    <entry>", $field_info{$field_abbrev}[0], "</entry>\n";
 			    print "    <entry>", $ftenum_names{$field_info{$field_abbrev}[1]}, "</entry>\n";
+ 				print "    <entry>", $field_info{$field_abbrev}[2], "</>\n";
 			    print "  </row>\n\n";
 
 			}
@@ -136,7 +138,7 @@
 		}
 		else {
 
-		    print "  <row>\n    <entry></entry>\n    <entry></entry>\n    <entry></entry>\n";
+		    print "  <row>\n    <entry></entry>\n    <entry></entry>\n    <entry></entry><entry></entry>\n";
 		    print "  </row>\n";
 
 		}