13 files changed, 5 insertions, 41 deletions
diff --git a/scripts/CVS/Entries b/scripts/CVS/Entries
deleted file mode 100644
index 2d1a4e5..0000000
--- a/scripts/CVS/Entries
+++ /dev/null
@@ -1,13 +0,0 @@
-/.cvsignore/1.10/Mon Sep 22 22:53:53 2003//
-/dirlist.cgi.in/1.7/Fri Feb  7 15:06:17 2003//
-/w3mhelp-funcdesc.en.pl.in/1.4/Mon Mar 22 17:03:13 2004//
-/w3mhelp-funcdesc.ja.pl.in/1.4/Mon Mar 22 17:03:13 2004//
-/w3mhelp-funcname.pl.in/1.3/Mon Apr  7 15:19:43 2003//
-/w3mmail.cgi.in/1.14/Mon Aug 30 16:32:24 2004//
-/xface2xbm.in/1.3/Mon Nov 18 17:33:01 2002//
-/xface2xpm.in/1.1/Tue Apr  9 14:45:58 2002//
-D/bm2menu////
-D/multipart////
-D/w3mman////
-/Makefile.in/1.11/Tue Jan  4 09:22:28 2011//
-/w3mhelp.cgi.in/1.29/Tue Jan  4 09:22:28 2011//
diff --git a/scripts/CVS/Repository b/scripts/CVS/Repository
deleted file mode 100644
index 578c817..0000000
--- a/scripts/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/scripts
diff --git a/scripts/CVS/Root b/scripts/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/scripts/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/scripts/bm2menu/CVS/Entries b/scripts/bm2menu/CVS/Entries
deleted file mode 100644
index 448ac0a..0000000
--- a/scripts/bm2menu/CVS/Entries
+++ /dev/null
@@ -1,3 +0,0 @@
-/README/1.1/Thu Nov 15 00:32:14 2001//
-/bm2menu.pl/1.1/Thu Nov 15 00:32:14 2001//
-D
diff --git a/scripts/bm2menu/CVS/Repository b/scripts/bm2menu/CVS/Repository
deleted file mode 100644
index c3eaf83..0000000
--- a/scripts/bm2menu/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/scripts/bm2menu
diff --git a/scripts/bm2menu/CVS/Root b/scripts/bm2menu/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/scripts/bm2menu/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/scripts/multipart/CVS/Entries b/scripts/multipart/CVS/Entries
deleted file mode 100644
index b503f2a..0000000
--- a/scripts/multipart/CVS/Entries
+++ /dev/null
@@ -1,6 +0,0 @@
-/.cvsignore/1.2/Mon Sep 22 22:53:53 2003//
-/README/1.2/Wed Nov 21 09:21:59 2001//
-/mailcap/1.1/Thu Nov 15 00:32:14 2001//
-/multipart.cgi.in/1.11/Tue Feb 18 15:26:39 2003//
-/Makefile.in/1.6/Tue Jan  4 09:22:28 2011//
-D
diff --git a/scripts/multipart/CVS/Repository b/scripts/multipart/CVS/Repository
deleted file mode 100644
index cb383c6..0000000
--- a/scripts/multipart/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/scripts/multipart
diff --git a/scripts/multipart/CVS/Root b/scripts/multipart/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/scripts/multipart/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/scripts/w3mman/CVS/Entries b/scripts/w3mman/CVS/Entries
deleted file mode 100644
index 2cc31ff..0000000
--- a/scripts/w3mman/CVS/Entries
+++ /dev/null
@@ -1,8 +0,0 @@
-/.cvsignore/1.3/Mon Sep 22 22:53:53 2003//
-/README/1.3/Wed Dec 18 16:48:02 2002//
-/hlink.cgi/1.1/Thu Nov 15 00:32:14 2001//
-/w3mman.1.in/1.6/Fri Apr  7 15:33:56 2006//
-/w3mman.in/1.5/Fri Apr  7 15:33:56 2006//
-/Makefile.in/1.5/Tue Jan  4 09:22:28 2011//
-/w3mman2html.cgi.in/1.9/Tue Jan  4 09:22:28 2011//
-D
diff --git a/scripts/w3mman/CVS/Repository b/scripts/w3mman/CVS/Repository
deleted file mode 100644
index 430e75e..0000000
--- a/scripts/w3mman/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/scripts/w3mman
diff --git a/scripts/w3mman/CVS/Root b/scripts/w3mman/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/scripts/w3mman/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in
index f430307..2e3576c 100644
--- a/scripts/w3mman/w3mman2html.cgi.in
+++ b/scripts/w3mman/w3mman2html.cgi.in
@@ -126,12 +126,14 @@ while(<F>) {
   s/\&/\&amp;/g;
   s/\</\&lt;/g;
   s/\>/\&gt;/g;
+  # non ASCII UTF-8 codepoint
+  my $utf8="[\300-\337][\200-\277]|[\340-\357][\200-\277]{2}|[\360-\367][\200-\277]{3}|[\370-\373][\200-\277]{4}|[\374\375][\200-\277]{5}";
 
-  s@([\200-\377].)(\010{1,2}\1)+@<b>$1</b>@g;
+  s@($utf8)(\010\1)+@<b>$1</b>@g;
   s@(\&\w+;|.)(\010\1)+@<b>$1</b>@g;
-  s@__\010{1,2}((\<b\>)?[\200-\377].(\</b\>)?)@<u>$1</u>@g;
+  s@_\010((\<b\>)?($utf8)(\</b\>)?)@<u>$1</u>@g;
   s@_\010((\<b\>)?(\&\w+\;|.)(\</b\>)?)@<u>$1</u>@g;
-  s@((\<b\>)?[\200-\377].(\</b\>)?)\010{1,2}__@<u>$1</u>@g;
+  s@((\<b\>)?($utf8)(\</b\>)?)\010_@<u>$1</u>@g;
   s@((\<b\>)?(\&\w+\;|.)(\</b\>)?)\010_@<u>$1</u>@g;
   s@.\010(.)@$1@g;