--- Pod-Html.pm-1.05	Tue Apr 20 01:33:32 2004
+++ Pod-Html.pm-1.05+mad08	Tue Apr 20 02:26:17 2004
@@ -3,7 +3,7 @@
 require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = 1.05;
+$VERSION = 1.0508;
 @ISA = qw(Exporter);
 @EXPORT = qw(pod2html htmlify);
 @EXPORT_OK = qw(anchorify);
@@ -58,6 +58,19 @@
 Specify the URL of a cascading style sheet.  Also disables all HTML/CSS
 C<style> attributes that are output by default (to avoid conflicts).
 
+=item email
+
+    --email=email-address
+
+Specify the email address of the author.
+
+=item encoding
+
+    --encoding
+
+Specify the encoding of the Pod file (and of the resulting HTML file).
+Defaults to "iso-8859-1".
+
 =item flush
 
     --flush
@@ -102,6 +115,12 @@
 Generate an index at the top of the HTML file.  This is the default
 behaviour.
 
+=item indexname
+
+    --indexname=name
+
+Specify the title of the generated index. The default title is "Index".
+
 =item infile
 
     --infile=name
@@ -109,6 +128,12 @@
 Specify the pod file to convert.  Input is taken from STDIN if no
 infile is specified.
 
+=item lang
+
+    --lang
+
+Specify the language of the documentation.
+
 =item libpods
 
     --libpods=name:...:name
@@ -225,10 +250,14 @@
 my $podroot = File::Spec->curdir;		# filesystem base directory from which all
 				#   relative paths in $podpath stem.
 my $css = '';                   # Cascading style sheet
+my $email = $Config{perladmin};	# email of the author
+my $encoding = 'iso-8859-1';	# encoding of the Pod file
+my $lang = '';			# language of the documentation
 my $recurse = 1;		# recurse on subdirectories in $podpath.
 my $quiet = 0;			# not quiet by default
 my $verbose = 0;		# not verbose by default
 my $doindex = 1;   	    	# non-zero if we should generate an index
+my $indexname = 'Index';    	# title of the generated index
 my $backlink = '';              # text for "back to top" links
 my $listlevel = 0;		# current list depth
 my @listend = ();		# the text to use to end the list.
@@ -271,10 +300,14 @@
 $podroot = File::Spec->curdir;		# filesystem base directory from which all
 				#   relative paths in $podpath stem.
 $css = '';                   # Cascading style sheet
+$email = $Config{perladmin};	# email of the author
+$encoding = 'iso-8859-1';	# encoding of the Pod file
+$lang = '';		# language of the documentation
 $recurse = 1;		# recurse on subdirectories in $podpath.
 $quiet = 0;		# not quiet by default
 $verbose = 0;		# not verbose by default
 $doindex = 1;   	    	# non-zero if we should generate an index
+$indexname = 'Index';    	# title of the generated index
 $backlink = '';		# text for "back to top" links
 $listlevel = 0;		# current list depth
 @listend = ();		# the text to use to end the list.
@@ -446,6 +479,10 @@
       $tdstyle = '';
     }
 
+    my $langattr = $lang ? qq| xml:lang="$lang" lang="$lang"| : '';
+
+    my $meta_encoding = $encoding ? qq|\n<meta http-equiv="Content-Type" content="text/html; charset=$encoding" />| : '';
+
       my $block = $header ? <<END_OF_BLOCK : '';
 <table border="0" width="100%" cellspacing="0" cellpadding="3">
 <tr><td class="block"$tdstyle valign="middle">
@@ -456,10 +493,10 @@
 
     print HTML <<END_OF_HEAD;
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml"$langattr>
 <head>
-<title>$title</title>$csslink
-<link rev="made" href="mailto:$Config{perladmin}" />
+<title>$title</title>$meta_encoding$csslink
+<link rev="made" href="mailto:$email" />
 </head>
 
 <body$bodystyle>
@@ -613,6 +650,8 @@
   --backlink     - set text for "back to top" links (default: none).
   --cachedir     - directory for the item and directory cache files.
   --css          - stylesheet URL
+  --email        - email address of the author
+  --encoding     - encoding of the Pod file (default is iso-8859-1)
   --flush        - flushes the item and directory caches.
   --[no]header   - produce block header/footer (default is no headers).
   --help         - prints this message.
@@ -621,8 +660,10 @@
                    in podpath stem (default is /).
   --[no]index    - generate an index at the top of the resulting html
                    (default behaviour).
+  --indexname    - title of the generated index (default is "Index")
   --infile       - filename for the pod to convert (input taken from stdin
                    by default).
+  --lang         - language of the documentation
   --libpods      - colon-separated list of pages to search for =item pod
                    directives in as targets of C<> and implicit links (empty
                    by default).  note, these are not filenames, but rather
@@ -646,20 +687,25 @@
     my ($opt_backlink,$opt_cachedir,$opt_css,$opt_flush,$opt_header,$opt_help,
 	$opt_htmldir,$opt_htmlroot,$opt_index,$opt_infile,$opt_libpods,
 	$opt_netscape,$opt_outfile,$opt_podpath,$opt_podroot,$opt_quiet,
-	$opt_recurse,$opt_title,$opt_verbose);
+	$opt_recurse,$opt_title,$opt_verbose,
+        $opt_email,$opt_encoding,$opt_indexname,$opt_lang);
 
     unshift @ARGV, split ' ', $Config{pod2html} if $Config{pod2html};
     my $result = GetOptions(
 			    'backlink=s' => \$opt_backlink,
 			    'cachedir=s' => \$opt_cachedir,
 			    'css=s'      => \$opt_css,
+			    'email=s'    => \$opt_email,
+			    'encoding=s' => \$opt_encoding,
 			    'flush'      => \$opt_flush,
 			    'header!'    => \$opt_header,
 			    'help'       => \$opt_help,
 			    'htmldir=s'  => \$opt_htmldir,
 			    'htmlroot=s' => \$opt_htmlroot,
 			    'index!'     => \$opt_index,
+			    'indexname=s'=> \$opt_indexname,
 			    'infile=s'   => \$opt_infile,
+			    'lang=s'     => \$opt_lang,
 			    'libpods=s'  => \$opt_libpods,
 			    'netscape!'  => \$opt_netscape,
 			    'outfile=s'  => \$opt_outfile,
@@ -681,11 +727,15 @@
     $backlink = $opt_backlink if defined $opt_backlink;
     $cachedir = $opt_cachedir if defined $opt_cachedir;
     $css      = $opt_css      if defined $opt_css;
+    $email    = $opt_email    if defined $opt_email;
+    $encoding = $opt_encoding if defined $opt_encoding;
     $header   = $opt_header   if defined $opt_header;
     $htmldir  = $opt_htmldir  if defined $opt_htmldir;
     $htmlroot = $opt_htmlroot if defined $opt_htmlroot;
     $doindex  = $opt_index    if defined $opt_index;
+    $indexname= $opt_indexname if defined $opt_indexname;
     $podfile  = $opt_infile   if defined $opt_infile;
+    $lang     = $opt_lang     if defined $opt_lang;
     $htmlfile = $opt_outfile  if defined $opt_outfile;
     $podroot  = $opt_podroot  if defined $opt_podroot;
     $quiet    = $opt_quiet    if defined $opt_quiet;
@@ -973,6 +1023,8 @@
 
     $listdepth = 0;
     $index = "";
+    process_text(\$indexname);
+    my $toctag = $indexname ? qq|\t<li id="index-toc">$indexname</li>| : '';
 
     # scan for =head directives, note their name, and build an index
     #  pointing to each of them.
@@ -987,7 +1039,8 @@
 
 	    while ($which_head != $listdepth) {
 		if ($which_head > $listdepth) {
-		    $index .= "\n" . ("\t" x $listdepth) . "<ul>\n";
+		    $index .= "\n" . ("\t" x $listdepth) . "<ul" .
+		        ($listdepth==0 ? qq| id="index">\n$toctag| : ">\n");
 		    $listdepth++;
 		} elsif ($which_head < $listdepth) {
 		    $listdepth--;
@@ -1535,6 +1588,11 @@
 	    $linktext = $1;
 	}
 
+	# full-blown URL's with associated label
+        if( $par =~ m{^\w+://}s ){
+	    return make_URL_href( $par, $linktext );
+	}
+
 	# make sure sections start with a /
 	$par =~ s{^"}{/"};
 
@@ -2080,8 +2138,11 @@
 # Special treatment for CGI queries.
 #
 sub make_URL_href($){
-    my( $url ) = @_;
-    if( $url !~
+    my( $url, $text ) = @_;
+    if( $text ) {
+        process_text(\$text);
+        $url = qq|<a href="$url">$text</a>|
+    } elsif( $url !~ 
         s{^(http:[-\w/#~:.+=&%@!]+)(\?.*)$}{<a href="$1$2">$1</a>}i ){
         $url = "<a href=\"$url\">$url</a>";
     }
