--- suikawiki/script/wiki.cgi	2002/02/04 15:03:23	1.4
+++ suikawiki/script/wiki.cgi	2002/02/04 15:23:58	1.6
@@ -20,7 +20,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# $Id: wiki.cgi,v 1.4 2002/02/04 15:03:23 wakaba Exp $
+# $Id: wiki.cgi,v 1.6 2002/02/04 15:23:58 wakaba Exp $
 ##############################
 my $version = "1.6.6";
 ##############################
@@ -565,7 +565,7 @@
     $line =~ s|''([^']+?)''|<em>$1</em>|g;          
     $line =~ s!
                 (
-                    ((mailto|http|https|ftp):[\x21-\x7E]*) # Direct http://...
+                    (&lt;(mailto|http|https|ftp|urn):[\x21-\x7E]*)&gt; # Direct http://...
                         |
                     ($WikiName)                         # LocalLinkLikeThis
                         |
@@ -670,15 +670,17 @@
 # URLやページの名前からリンクを作る
 sub make_link {
     my $name = shift;
-    if ($name =~ /^(http|https|ftp).*?(\.gif|\.png|\.jpeg|\.jpg)?$/) {
+    if ($name =~ /^(http|https|ftp).*?(\.png|\.jpeg|\.jpg)?$/) {
         if ($2) {
             return qq|<a href="$name"><img border="0" src="$name" /></a>|;
         } else {
-            return qq|<a href="$name">$name</a>|;
+            return qq|&lt;<a href="$name">$name</a>&gt;|;
         }
     } elsif ($name =~ /^mailto:(.*)/) {
         my $address = $1;
-        return qq|<a href="$name">$address</a>|;
+        return qq|&lt;<a href="$name">$address</a>&gt;|;
+    } elsif ($name =~ /^urn:[0-9A-Za-z_:-]+/) {
+        return qq|&lt;<a href="/uri-res/N2L?${name}">$name</a>&gt;|;
     } elsif ($database{$name}) {
         my $percent_name = &encode_percent($name);
         return qq|<a href="$thisurl?mycmd=read;mypage=$percent_name">$name</a>|;
@@ -834,7 +836,7 @@
 ----
 *大見出し2
 **小見出し2-1
-http://www.hyuki.com/
+&lt;http://suika.fam.cx/&gt;
 **小見出し2-2
 
 [[結城浩]]