[Mlterm-dev-ja] update w3mmlconfig

[<hs...@mt...>]

坂本です。

w3mmlconfig を最新の mlconfig に合わせました。
(ついでに、Reset ボタンを付けましたが、要らないかも。)
-----------------------------------
坂本 浩則 <hs...@mt...>
 http://www2u.biglobe.ne.jp/~hsaka/

--- tool/w3mmlconfig/mk_mlconfig-data.pl.orig	Fri Jan 25 00:38:02 2002
+++ tool/w3mmlconfig/mk_mlconfig-data.pl	Mon Feb  4 21:10:15 2002
@@ -2,10 +2,11 @@
 while(<>) {
 	/^#/ && next;
 	chop;
-	($s, $c, $t) = split(" ", $_, 3);
+	($s, $c, $r, $t) = split(" ", $_, 4);
 	push(@section, $s);
 	$section_attr->{$s} = {
 		col => $c,
+		row => $r,
 		title => $t,
 		key => [],
 	};
@@ -21,6 +22,7 @@
 for $s (@section) {
 	print "\t$s => {\n";
 	print "\t\tcol => $section_attr->{$s}{col},\n";
+	print "\t\trow => $section_attr->{$s}{row},\n";
 	print "\t\ttitle => '$section_attr->{$s}{title}',\n";
 	print "\t\tkey => [\n";
 	for $k (@{$section_attr->{$s}{key}}) {
--- tool/w3mmlconfig/mlconfig-data.orig	Mon Feb  4 21:26:09 2002
+++ tool/w3mmlconfig/mlconfig-data	Mon Feb  4 21:17:08 2002
@@ -1,6 +1,7 @@
-# id		col	title
-encoding	0	Encoding
-appearance	1	Appearance
-copy_paste	0	Copy&amp;paste
-others		1	Others
-wall_picture	-1
+# id		col	row	title
+encoding	0	1	Encoding
+appearance	1	2	Appearance
+copy_paste	0	2	Copy&amp;paste
+others		0	2	Others
+font		0	1	Font
+wall_picture	-1	-1
--- tool/w3mmlconfig/mlconfig.cgi.in.orig	Fri Jan 25 00:38:03 2002
+++ tool/w3mmlconfig/mlconfig.cgi.in	Mon Feb  4 21:22:51 2002
@@ -91,6 +91,8 @@
 <input type=submit name="SUBMIT" value="Apply">
 &nbsp;
 <input type=submit name="SUBMIT" value="Cancel">
+&nbsp;
+<input type=reset value="Reset">
 <table border=1>
 <tr><td>Font size<br>
 <input type=submit name="fontsize_larger" value="Larger">
@@ -126,9 +128,9 @@
 		print "<tr>";
 	}
 	print <<EOF;
-<td align=center valign=top width="50%">
+<td align=left valign=top rowspan=$attr->{row}>
 <b>$attr->{title}</b>
-<table>
+<table width=240>
 EOF
 	for $k (@{$attr->{key}}) {
 		&make_key($k);
@@ -148,6 +150,8 @@
 		print "<tr>";
 		if ($type =~ /^checkbox/ || $type =~ /^none/) {
 			print "<td colspan=2>\n";
+		} elsif ($type =~ /^radio/) {
+			print "<td colspan=2><nobr>$attr->{title}\n";
 		} else {
 			print "<td><nobr>$attr->{title}</nobr>\n";
 			print "<td>";
@@ -171,12 +175,13 @@
 		print "</select>\n";
 	} elsif ($type =~ /^radio/) {
 		for $i (@{$attr->{item}}) {
-			print "<nobr><input type=radio name=\"$k\" value=\"$i\"";
+			print "<input type=radio name=\"$k\" value=\"$i\"";
 			if ($value->{$k} eq "$i") {
 				print " checked";
 			}
-			print ">$item_attr->{$k}{$i}</nobr>\n";
+			print ">$item_attr->{$k}{$i}\n";
 		}
+		print "</nobr>\n";
 	} elsif ($type =~ /^checkbox/) {
 		print "<input type=checkbox name=\"$k\" value=\"true\"";
 		if ($value->{$k} eq "true") {
--- tool/w3mmlconfig/section/appearance.orig	Fri Jan 25 00:38:04 2002
+++ tool/w3mmlconfig/section/appearance	Mon Feb  4 20:51:32 2002
@@ -1,7 +1,6 @@
 fg_color	select:lower	black	0	FG color
 bg_color	select:lower	white	0	BG color
-fontsize	text:digit	16	0	Font size
+line_space	text:digit	0	0	Line space
+brightness	text:digit	100	0	Brightness
 fade_ratio	text:digit	100	0	Fade ratio
-use_variable_column_width	checkbox	false	0	Variable column width
-use_anti_alias	checkbox	false	0	Anti Alias
-use_transbg	checkbox	false	1	Transparent
+use_transbg	checkbox	false	0	Transparent
--- tool/w3mmlconfig/section/others.orig	Fri Jan 25 00:38:05 2002
+++ tool/w3mmlconfig/section/others	Mon Feb  4 20:42:08 2002
@@ -1,3 +1,5 @@
+screen_width_ratio	text:digit	100	0	Width ratio
+screen_height_ratio	text:digit	100	0	Height ratio
 tabsize		text:digit	8	0	Tab size
 logsize		text:digit	128	0	Log size
 mod_meta_mode	radio:lower	none	0	Mod Meta mode
--- tool/w3mmlconfig/section/font.orig	Mon Feb  4 20:39:26 2002
+++ tool/w3mmlconfig/section/font	Mon Feb  4 20:40:13 2002
@@ -0,0 +1,3 @@
+fontsize	text:digit	16	0	Font size
+use_variable_column_width	checkbox	false	0	Variable column width
+use_anti_alias	checkbox	false	0	Anti Alias
--- tool/w3mmlconfig/key/vertical_mode.orig	Mon Feb  4 20:38:27 2002
+++ tool/w3mmlconfig/key/vertical_mode	Mon Feb  4 20:39:01 2002
@@ -0,0 +1,3 @@
+none	None
+cjk	CJK
+mongol	Mongol