15 files changed, 326 insertions, 140 deletions

diff --git a/cgi-bin/css/lxrng.css b/cgi-bin/css/lxrng.css
index 637c774..f6a13dc 100644
--- a/cgi-bin/css/lxrng.css
+++ b/cgi-bin/css/lxrng.css
@@ -1,4 +1,14 @@
-/* http://devnull.tagsoup.com/fixed/horizontal.html */
+body { 
+	font-family: sans-serif;
+	margin-top: 3px;
+	margin-left: 3px;
+	margin-right: 3px;
+}
+
+span.lxr_title {
+	float: left;
+	vertical-align: middle;
+}
 
 span.lxr_l {
 	text-transform: uppercase;
@@ -19,13 +29,10 @@ span.lxr_r {
 	border-width: 1px;
 }
 
-span.lxr_title {
-	float: left;
-}
-
 span.lxr_menu {
 /*	float: right; */
 }
+
 div.lxr_menu {
 	float: right;
 }
@@ -35,9 +42,18 @@ span.lxr_search {
 	margin-left: 5px;
 	padding-left: 5px;
 	margin-right: 5px;
-/*	border-left: solid;
-	border-width: 1px; */
+	border-left: solid;
+	border-width: 1px;
+}
+
+span.lxr_search input#search {
+	width: 8em;
+}
+
+span.lxr_search button {
+	border: solid 1px;
 }
+
 span.lxr_prefs {
 	font-weight: normal;
 	margin-left: 5px;
@@ -57,6 +73,7 @@ span.lxr_version {
 body.full div.search_results {
 	background: #F0F0F0;
 	z-index: 3;
+/*	position: absolute; */
 	position: fixed;
 	right: 3px;
 	top: 35px;
@@ -87,34 +104,54 @@ span.close-button {
 	margin-right: 3px;
 }
 
-a.line:before {
+/* a.line:before {
 	content: attr(id);
-}	
+} */
 
 a.line {
 	position: absolute;
 	top: auto;
 	left: 0px;
-	width: 4.5ex;
+	height: 2ex;
+	width: 5.5ex;
 	text-align: right;
-	background: #e0e0e0;
 
 	border: solid;
 	border-width: 1px;
 	border-color: #000000;
 	margin-left: 3px;
-	padding-right: 5px;
 }
 
-body {
-	margin-top: 3px;
-	margin-left: 3px;
-	margin-right: 3px;
-	overflow: scroll;
+a.line span { 
+	position: absolute;
+	top: auto;
+	height: 2ex;
+	left: 0px;
+	background: #6c6c6c;
+	filter: alpha(opacity=10);
+	moz-opacity: .10;
+	opacity: .10;
+	width: 5.5ex;
+}
+
+
+pre#file_contents li { 
+	color: blue;
+}
+
+span.line {
+	position: absolute;
+	left: 7ex;
+	color: black;
+	white-space: pre;
 }
 
 pre {
-	margin-left: 6ex;
+	margin-left: 1.5ex;
+}
+
+a img { 
+	border: 0px;
 }
 
 div.headingtop {
@@ -156,19 +193,6 @@ button.print {
 	background: #F0F0F0;
 }
 
-
-table.query {
-	width: 100%;
-}
-
-table.params {
-	width: 100%;
-}
-
-table.directory {
-	width: 100%;
-}
-
 table.directory td.name {
 	width: 30ex;
 }	
@@ -208,7 +232,7 @@ span.comment {
 
 span.string {
 	font-style: italic;
-	color: red;
+	color: green;
 }
 
 div.find {
@@ -282,3 +306,20 @@ div.error {
 form {
 	display: inline;
 }
+
+div.footer { 
+	margin-top: 30px;
+	border-top: solid;
+	border-width: 1px;
+	padding-top: 10px;
+	font-style: italic;
+	text-align: center;
+	font-size: 80%;
+}
+
+div.subfooter { 
+	font-style: italic;
+	text-align: center;
+	font-size: 80%;
+}
+
diff --git a/cgi-bin/js/lxrng-funcs.js b/cgi-bin/js/lxrng-funcs.js
index 614879e..90129fe 100644
--- a/cgi-bin/js/lxrng-funcs.js
+++ b/cgi-bin/js/lxrng-funcs.js
@@ -1,17 +1,18 @@
 function popup_search(searchform) {
 	searchform = document.getElementById(searchform);
-	searchform.target = window.name + '-popup';
+	searchform.target = 'popup_' + window.name;
 	searchform.navtarget.value = window.name;
-	window.open('', window.name + '-popup',
-		'width=400,height=600,menubar=yes,status=yes,scrollbars=yes');
+	window.open('about:blank', 'popup_' + window.name,
+		'resizable,width=400,height=600,menubar=yes,status=yes,scrollbars=yes');
 	return true;
 }
 
 function popup_anchor() {
 	var anchor = this;
-	window.open('', window.name + '-popup',
-		'width=400,height=600,menubar=yes,status=yes,scrollbars=yes');
-	anchor.target = window.name + '-popup';
+	window.open('about:blank', 'popup_' + window.name,
+		'resizable,width=400,height=600,location=no,menubar=yes,scrollbars=yes'); 
+
+	anchor.target = 'popup_' + window.name;
 
 	if (anchor.href.indexOf("navtarget=") >= 0)
 		return true;
@@ -33,7 +34,7 @@ function navigate_here(searchform) {
 
 function window_unique(serial) {
 	if (!window.name)
-		window.name = 'lxr-source-' + serial;
+		window.name = 'lxr_source_' + serial;
 }
 
 function do_search(form) {
@@ -43,15 +44,15 @@ function do_search(form) {
 		res.innerHTML = '<div class="progress">Searching...</div>';
 	
 		pjx_search(['type__search',
-			    'search', 'v', 'tree__' + loaded_tree],
+			    'search', 'v', 'tree__' + loaded_tree, 'NO_CACHE'],
 			   ['search_results']);
 		return false;
 	}
 	else if (use_popup_navigation) {
-		form.target = window.name + '-popup';
+		form.target = 'popup_' + window.name;
 		form.navtarget.value = window.name;
-		reswin = window.open('', window.name + '-popup',
-			'width=400,height=600,menubar=yes,status=yes,scrollbars=yes');
+		reswin = window.open('about:blank', 'popup_' + window.name,
+			'resizable,width=400,height=600,location=no,menubar=yes,scrollbars=yes');
 	}
 	return true;
 }
@@ -118,7 +119,6 @@ function check_hash_navigation() {
 			hash_check = setTimeout('check_hash_navigation()', 50);
 		}
 		else {
-			// alert(location.hash + ' / ' + loaded_hash);
 			load_content();		
 		}
 	}
@@ -136,10 +136,16 @@ function load_file(tree, file, ver, line) {
 		clearTimeout(hash_check);
 	}
 
+	if ((pending_tree == tree) && (pending_file == file)) {
+		location.hash = location.hash.replace(/\#L\d+$/, '') +
+			'#L' + line;
+		check_hash_navigation();
+		return false;
+	}
+
+
 	var res = document.getElementById('content');
 
-	// TODO: check if file already loaded and perform only line
-	// location update.
 	res.innerHTML = '<div class="progress">Loading...</div>';
 	pending_line = line;
 	pending_tree = tree;
@@ -150,8 +156,13 @@ function load_file(tree, file, ver, line) {
 	else {
 		pending_ver = '';
 	}
-
-	pjx_load_file(['tree__' + tree, 'file__' + file, 'v__' + ver, 'line__' + line],
+	
+	if (!file)
+		file = '/';
+	if (line < 1)
+		line = 1;
+	pjx_load_file(['tree__' + tree, 'file__' + file, 'v__' + ver,
+		       'line__' + line, 'NO_CACHE'],
 		      [load_file_finalize]);
 	return false;
 }
@@ -183,10 +194,22 @@ function load_file_finalize(content) {
 	var pre = document.getElementById('file_contents');
 	if (pre && pre.className == 'partial') {
 		pjx_load_file(['tree__' + pending_tree, 'file__' + pending_file,
-			       'v__' + pending_ver, 'full__1'],
+			       'v__' + pending_ver, 'full__1', 'NO_CACHE'],
 			      [load_file_finalize]);
 	}
 
+	var print = document.getElementById('lxr_print');
+	var dirlist = document.getElementById('content_dir');
+	if (dirlist) {
+		print.style.display = 'none';
+	}
+	else {
+		var pform = document.getElementById('print_form');
+		pform.action = '../' + full_tree + '/+print=' + 
+			pending_file.replace(/^\/?/, '');
+		print.style.display = 'inline';
+	}
+
 	if (hash_check) {
 		clearTimeout(hash_check);
 	}
@@ -211,7 +234,6 @@ function load_file_finalize(content) {
 	loaded_ver = pending_ver;
 	hash_check = setTimeout('check_hash_navigation()', 50);
 
-//	return;
 //	TODO: This really takes oodles of time.  Consider coding into html.
 	var i;
 	for (i = 0; i < document.links.length; i++) {
@@ -231,6 +253,9 @@ function load_file_finalize(content) {
 }
 
 function load_content() {
+	if (!use_ajax_navigation) {
+		return false;
+	}
 	var tree = location.hash.split('/', 1);
 	tree = tree[0].split(/[+]/);
 	var ver = tree[1] || '';
@@ -238,17 +263,16 @@ function load_content() {
 	var file = location.hash.replace(/^[^\/]*\/?/, '');
 	var line = file.replace(/.*\#L(\d+)/, '$1');
 	file = file.replace(/\#L\d+$/, '');
-
 	load_file(tree, file, ver, line);
 
-	pjx_releases(['tree__' + tree],
+	pjx_releases(['tree__' + tree, 'NO_CACHE'],
 		     [load_content_finalize]);
 }
 
 function load_content_finalize(content) {
 	var res = document.getElementById('ver_select');
 	res.innerHTML = content;
-	var verlist = document.getElementById('ver_list');
+	var verlist = document.getElementById('v');
 	verlist.value = pending_ver;
 }
 
@@ -274,6 +298,24 @@ function update_version(verlist, base_url, tree, defversion, path) {
 	}
 }
 
+function next_version() {
+	var verlist = document.getElementById('v');
+	if (verlist.selectedIndex > 0) {
+		verlist.selectedIndex = verlist.selectedIndex - 1;
+		update_version(verlist, '', '', '', '');
+	}
+	return false;
+}
+
+function previous_version() {
+	var verlist = document.getElementById('v');
+	if (verlist.selectedIndex < verlist.length - 1) {
+		verlist.selectedIndex = verlist.selectedIndex + 1;
+		update_version(verlist, '', '', '', '');
+	}
+	return false;
+}
+
 function popup_prepare(serial) {
 	window_unique(serial);
 	var i;
@@ -293,8 +335,6 @@ function ajax_lookup_anchor(event, anchor) {
 	if (!anchor)
 		anchor = this;
 	
-	// TODO: Fix
-//	lookup = anchor.href.replace(/^(http:.*?lxr\/[+]ajax\/|)/, '');
 	lookup = anchor.href.replace(/^(http:.*?\/.*?[+][*]\/|)/, '');
 
 	var lvar = document.getElementById('ajax_lookup');
@@ -304,7 +344,7 @@ function ajax_lookup_anchor(event, anchor) {
 	res.style.display = 'block';
 	res.innerHTML = '<div class="progress">Searching...</div>';
 
-	pjx_search(['ajax_lookup', 'v', 'tree__' + loaded_tree],
+	pjx_search(['ajax_lookup', 'v', 'tree__' + loaded_tree, 'NO_CACHE'],
 		   ['search_results']);
 	return false;
 }
diff --git a/cgi-bin/lxr b/cgi-bin/lxr
index a0c0f6e..f71d061 100755
--- a/cgi-bin/lxr
+++ b/cgi-bin/lxr
@@ -10,7 +10,7 @@ use IO::Handle;
 
 use LXRng ROOT => "$FindBin::Bin/..";
 use LXRng::Context;
-use LXRng::Lang qw(C);
+use LXRng::Lang;
 use LXRng::Parse::Simple;
 use LXRng::Markup::File;
 use LXRng::Markup::Dir;
@@ -84,19 +84,21 @@ sub print_markedup_file {
 	    my $focus = $context->param('line') || 0;
 	    $focus = 0 if $context->param('full');
 	    my $class = $focus ? 'partial' : 'full';
-	    print("<pre id=\"file_contents\" class=\"$class\">");
+	    my $start = $focus > 5 ? " start=".($focus - 5) : "";
+	    print("<pre id=\"file_contents\" class=\"$class\"><ol$start><span>");
 	    while (<$cache>) {
 		next if $focus and $. < $focus - 5;
 		print($_);
 		last if $focus and $. > $focus + 70;
 	    }
-	    print("</pre>");
+	    print("</span></ol></pre>");
 	    close($cache);
 	}
 	else {
 	    my $cache;
 	    open($cache, '>', $cfile) if $cfile;
 	    my $handle = $node->handle();
+	    LXRng::Lang->init($context);
 	    my $lang   = LXRng::Lang->new($node);
 	    my $parse  = LXRng::Parse::Simple->new($handle, 8,
 						   @{$lang->parsespec});
@@ -109,18 +111,26 @@ sub print_markedup_file {
 	    # time it's needed, but requires a bit of fiddling with
 	    # perlio and the streams to get right.  Also messes up
 	    # partial transfers.
-	    print("<pre id=\"file_contents\" class=\"full\">");
+	    print("<pre id=\"file_contents\" class=\"full\"><ol><span>");
 	    while (1) {
 		my @frags = $markup->markupfile($subst, $parse);
 		last unless @frags;
 		print(@frags);
 		print($cache @frags) if $cache;
 	    }
-	    print("</pre>\n");
+	    print("</span></ol></pre>\n");
 	}
     }
 }
 
+sub print_tree_list {
+    my ($context, $template) = @_;
+
+    $template->process('tree_list.tt2',
+		       {'context' => $context})
+		or die $template->error();
+}    
+
 sub print_release_list {
     my ($context, $template) = @_;
 
@@ -147,40 +157,74 @@ sub source {
 	    print($query->header(-type => 'text/html',
 				 -charset => 'utf-8'));
 
-	    my $base = $context->base_url(1);
-	    $base =~ s,/*$,/ajax+*/,;
-
-	    $template->process('main.tt2',
-			       {'context'    => $context,
-				'base_url'   => $base,
-				'javascript' => $pjx->show_javascript(),
-				'is_ajax' => 1})
-		or die $template->error();
+	    if ($context->release eq 'trees') {
+		print_tree_list($context, $template);
+	    }
+	    else {
+		my $base = $context->base_url(1);
+		$base =~ s,/*$,/ajax+*/,;
+
+		$template->process('main.tt2',
+				   {'context'    => $context,
+				    'base_url'   => $base,
+				    'javascript' => $pjx->show_javascript(),
+				    'is_ajax' => 1})
+		    or die $template->error();
+	    }
 	}
 	return;
     }
 
+    if ($context->tree eq '') {
+	print($query->header(-type => 'text/html',
+			     -charset => 'utf-8'));
+	print_tree_list($context, $template);
+	return;
+    }
+
+
+    my $ver = $context->release;
+    my $rep = $context->config->{'repository'};
+    die "No tree given" unless $rep;
+
+    my $node = $rep->node($context->path, $ver);
+    die "Node not found: ".$context->path." ($ver)" unless $node;
+
     my $gzip = do_compress_response($query);
 
-    # history cookie
+    my @history = $query->cookie('lxr_history_'.$context->tree);
+    if ($node->isa('LXRng::Repo::File')) {
+	my $h = $context->path.'+'.$ver;
+	@history = ($h, grep { $_ ne $h } @history);
+	splice(@history, 15) if @history > 15;
+    }
+
+    my $lxr_hist = $query->cookie(-name    => 'lxr_history_'.$context->tree,
+				  -values  => \@history,
+				  -expires => '+1y');
 
     print($query->header(-type => 'text/html',
 			 -charset => 'utf-8',
+			 -cookie => $lxr_hist,
 			 $gzip ? (-content_encoding => 'gzip') : ()));
 
     binmode(\*STDOUT, ":gzip") if $gzip;
 
-    my $ver = $context->release;
-    my $rep = $context->config->{'repository'};
-    die "No tree given" unless $rep;
+    my @rels = @{$context->all_releases()};
+    unshift(@rels, $rels[0]);
+    while (@rels > 2 and $rels[1] ne $context->release) {
+	shift(@rels);
+    }
 
-    my $node = $rep->node($context->path, $ver);
-    die "Node not found: ".$context->path." ($ver)" unless $node;
+    my $ver_next = @rels > 1 ? $rels[0] : $context->release;
+    my $ver_prev = @rels > 2 ? $rels[2] : $context->release;
 
     my %template_args = (%{$template_extra_args || {}},
 			 'context'    => $context,
 			 'tree'	      => $context->tree,
 			 'node'       => $node,
+			 'ver_prev'   => $ver_prev,
+			 'ver_next'   => $ver_next,
 			 'base_url'   => $context->base_url,
 			 'javascript' => $pjx->show_javascript());
 
@@ -293,7 +337,7 @@ sub search {
 	    $$ident[1] = $LXRng::Lang::deftypes{$$ident[1]};
 	    $$ident[5] &&= $LXRng::Lang::deftypes{$$ident[5]};
 
-	    use Data::Dumper;
+	    # use Data::Dumper;
 	    # warn Dumper($symname, $symid, $ident, $refs);
 	    $template_args{'ident_res'} = {'query' => $symname,
 					   'ident' => $ident,
@@ -359,8 +403,10 @@ sub handle_ajax_request {
     my ($query, $context, $template) = @_;
     my $gzip = do_compress_response($query);
     
+    $query->no_cache(1);
     print($query->header(-type => 'text/html',
 			 -charset => 'utf-8',
+			 -cache-control => 'no-store, no-cache, must-revalidate',
 			 $gzip ? (-content_encoding => 'gzip') : ()));
 
     binmode(\*STDOUT, ":gzip") if $gzip;
@@ -458,6 +504,7 @@ sub generate_pdf {
 	'~'	=> '\~{}',	'<'	=> "\$<\$",
 	'>'	=> "\$>\$",	"\\"	=> "\$\\backslash\$",
 	'-'	=> '\dash{}',
+# These are latin1-replacements, and interact badly with utf8...
 	"\242"	=> '?',		"\244"	=> '?',
 	"\245"	=> '?',		"\246"	=> '?',
 	"\252"	=> "\$\252\$",	"\254"	=> "\$\254\$",
@@ -465,7 +512,8 @@ sub generate_pdf {
 	"\261"	=> "\$\261\$",	"\262"	=> "\$\262\$",
 	"\263"	=> "\$\263\$",	"\265"	=> "\$\265\$",
 	"\271"	=> "\$\271\$",	"\272"	=> "\$\272\$",
-	"\327"	=> "\$\327\$",	"\367"	=> "\$\367\$");
+	"\327"	=> "\$\327\$",	"\367"	=> "\$\367\$",
+		     );
 
     my $tspecials = join('', map { quotemeta($_) } keys(%tspecials));
 
@@ -476,6 +524,7 @@ sub generate_pdf {
     die "No such file" unless $node;
 
     my $handle = $node->handle();
+    LXRng::Lang->init($context);
     my $lang   = LXRng::Lang->new($node);
     my $parse  = LXRng::Parse::Simple->new($handle, 8,
 					   @{$lang->parsespec});
@@ -543,7 +592,8 @@ sub generate_pdf {
 		$cont  = 1;
 	    }
 
-	    $part =~ s/([$tspecials])/$tspecials{$1}/ge;
+	    $part =~ s(([$tspecials\0-\010\013\014\016-\037\200-\240]))
+		(exists $tspecials{$1} ? $tspecials{$1} : '?')ge;
 	    
 	    if ($btype eq 'code') {
 		$part =~ s/$resre/\\textbf{$1}/g if $resre;
diff --git a/lib/LXRng/Context.pm b/lib/LXRng/Context.pm
index caaa473..dab03e3 100644
--- a/lib/LXRng/Context.pm
+++ b/lib/LXRng/Context.pm
@@ -50,6 +50,7 @@ sub new {
 
     if ($$self{'config'}) {
 	$$self{'release'} ||= $$self{'config'}{'ver_default'};
+	$$self{'release'} ||= $$self{'config'}{'ver_list'}[0];
     }
 
     return $self;
diff --git a/lib/LXRng/Lang.pm b/lib/LXRng/Lang.pm
index 7e6c278..754cb72 100644
--- a/lib/LXRng/Lang.pm
+++ b/lib/LXRng/Lang.pm
@@ -28,9 +28,10 @@ use vars qw(@languages %deftypes %defweight);
 		  qw(c f i n s t u p x v d e g m l) };
 
 
-sub import {
-    my ($self, @langs) = @_;
+sub init {
+    my ($self, $context) = @_;
 
+    my @langs = @{$context->config->{'languages'} || []};
     push(@langs, 'Undefined');
     foreach my $l (@langs) {
 	eval "require LXRng::Lang::$l";
diff --git a/lib/LXRng/Markup/File.pm b/lib/LXRng/Markup/File.pm
index abb763c..3983a3c 100644
--- a/lib/LXRng/Markup/File.pm
+++ b/lib/LXRng/Markup/File.pm
@@ -30,11 +30,9 @@ sub make_format_newline {
 	$line++;
 	$nl = safe_html($nl);
 
-	# id="<num>" is not valid XHTML 1.0, but it is an extremely
-	# handy shorthand for generating line numbers that don't
-	# affect cut-n-paste.
-	return qq{$nl<a id="L$line" name="L$line"></a>}.
-	    qq{<a href="$name#L$line" id="$line" class="line"></a>};
+	return qq{</span>$nl<li>}.
+	    qq{<a href="$name#L$line" class="line"><span></span></a>}.
+	    qq{<a id="L$line" name="L$line"></a><span class="line">};
     }
 }
 
@@ -98,7 +96,10 @@ sub format_code {
 sub format_raw {
     my ($self, $str) = @_;
 
-    return safe_html($str);
+    $str = safe_html($str);
+    $str =~ s((http://[^/\"]+(/[^\s\"]*|)[^.\,\)\>\"]))
+	(<a href="$1">$1</a>)g;
+    return $str;
 }
 
 sub markupfile {
diff --git a/lxr-genxref b/lxr-genxref
index 9f055ae..25115ec 100755
--- a/lxr-genxref
+++ b/lxr-genxref
@@ -8,7 +8,7 @@ use lib "$FindBin::Bin/lib";
 
 use LXRng ROOT => $FindBin::Bin;
 use LXRng::Context;
-use LXRng::Lang qw(C);
+use LXRng::Lang;
 use LXRng::Index;
 use LXRng::Parse::Simple;
 
@@ -234,12 +234,12 @@ my $tree = shift(@ARGV);
 my @versions = @ARGV;
 
 my $context = LXRng::Context->new('tree' => $tree);
+LXRng::Lang->init($context);
 
 my $index   = $context->config->{'index'};
 my $hash    = $context->config->{'search'};
 my $rep     = $context->config->{'repository'};
 
-
 sub inventory_release {
     my ($tree, $version) = @_;
 
diff --git a/tmpl/content_dir.tt2 b/tmpl/content_dir.tt2
index f5bab3f..b4a3f30 100644
--- a/tmpl/content_dir.tt2
+++ b/tmpl/content_dir.tt2
@@ -1,4 +1,4 @@
-<table class="directory">
+<table class="directory" id="content_dir">
 [% FOREACH link = dir_listing %]
 <tr class="node">
 <td class="name">
diff --git a/tmpl/footer.tt2 b/tmpl/footer.tt2
index 11a09ca..2c83414 100644
--- a/tmpl/footer.tt2
+++ b/tmpl/footer.tt2
@@ -1,3 +1,6 @@
 
+<div class="footer">
+The original LXR software by the <a href="http://sourceforge.net/projects/lxr">LXR community</a>, this experimental version by <a href="mailto:lxr@linux.no">lxr@linux.no</a>.
+</div>
 </body>
 </html>
diff --git a/tmpl/header.tt2 b/tmpl/header.tt2
index 0b07111..12c2b8b 100644
--- a/tmpl/header.tt2
+++ b/tmpl/header.tt2
@@ -1,31 +1,34 @@
-<!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" lang="en" xml:lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    [% IF is_ajax %]
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <script type="text/javascript">
-      var tree = location.hash.match(/^#([^/+]+)([+][^/]*|)/);
-      if (tree) {
+      var use_ajax_navigation = [% IF is_ajax %]1[% ELSE %]0[% END %];
+      var use_popup_navigation = [% IF is_popup %]1[% ELSE %]0[% END %];
+      [% IF is_ajax %]
+
+      var startup_tree = location.hash.match(/^#([^/+]+)([+][^/]*|)/);
+      if (startup_tree) {
 	var base = '[% base_url %]';
-	base = base.replace(/\/ajax[+][*]/, '/' + tree[1] + '+*');
-  	document.write('<base href="' + base + '" />');
+	base = base.replace(/\/ajax[+][*]/, '/' + startup_tree[1] + '+*');
+  	document.write('<base href="' + base + '">');
       }
       else {
-  	document.write('<base href="[% base_url %]" />');
+  	document.write('<meta http-equiv="Refresh" content="1;+trees">');
+	use_ajax_navigation = 0;
       }
+      [% END %]
     </script>
-    [% ELSE %]
-    <base href="[% base_url %]" />
+    [% IF !is_ajax %]
+    <base href="[% base_url %]">
     [% END %]
     <script type="text/javascript" src="../../js/lxrng-funcs.js"></script>
-    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng" />
+    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng">
 
     [% javascript %]
 
     <script type="text/javascript">
-      var use_ajax_navigation=[% IF is_ajax %]1[% ELSE %]0[% END %];
-      var use_popup_navigation=[% IF is_popup %]1[% ELSE %]0[% END %];
     </script>
 
     <title>LXR [% context.tree -%]/
@@ -48,30 +51,36 @@
 	  %]<a href="[% elem.path %]">[% elem.node %]</a>[%
 	  END %]
 	</span>
-	<img src="../../gfx/rolldown.png" />
-	<!-- TODO: appears to break w. ajax nav. -->
-	[% IF node.name.match('[^/]$') %]
-	<form action="+print=[% node.name %]" method="post">
-	  <button type="submit" class="print"><img src="../../gfx/print.png"></button>
-	</form>
-	[% END %]
+	<img src="../../gfx/rolldown.png" alt="History">
+        <span id="lxr_print"
+          [% IF is_ajax || node.name.match('/$') %]style="display: none;"[% END %]>
+	  <form action="+print=[% node.name %]" method="post" id="print_form">
+	    <button type="submit" class="print">
+      	      <img src="../../gfx/print.png" alt="Print">
+            </button>
+	  </form>
+        </span>
       </span>
 	
       <div class="lxr_menu">
 	<span class="lxr_version">
-	  <img src="../../gfx/left.png" alt="&lt;&lt;"/>
+	  <a [% IF is_ajax %]href="#" onclick="return previous_version();"[% ELSE %]
+	     href="../[% context.tree %]+[% ver_prev %]/[% node.name %]"[% END %]>
+	    <img src="../../gfx/left.png" alt="&lt;&lt;"></a>
 	  <form action="[% node.name %]" method="get">
 	    <span id="ver_select">
 	      [% INCLUDE release_select.tt2, context = context %]
 	    </span>
 	  </form>
-	  <img src="../../gfx/right.png" alt="&gt;&gt;"/>
+	  <a [% IF is_ajax %]href="#" onclick="return next_version();"[% ELSE %]
+	     href="../[% context.tree %]+[% ver_next %]/[% node.name %]"[% END %]>
+	    <img src="../../gfx/right.png" alt="&gt;&gt;"></a>
 	</span>
 
 	<span class="lxr_search">
 	  <form action="+search" method="post" onsubmit="return do_search(this);">
-	    <input type="hidden" name="navtarget" value="" />
-	    <input type="text" name="search" id="search" />
+	    <input type="hidden" name="navtarget" value="">
+	    <input type="text" name="search" id="search">
 	    <button type="submit">Search</button>
 	  </form>
 	</span>
@@ -83,8 +92,8 @@
 	  </a>
 	</span>
       </div>
-      <form action="+ajax" method="post" onsubmit="return false;">
-	<input type="hidden" name="ajax_lookup" id="ajax_lookup" value="" />
+      <form action="ajax+*" method="post" onsubmit="return false;">
+	<input type="hidden" name="ajax_lookup" id="ajax_lookup" value="">
       </form>
 
       <div class="headingbottom"></div>
diff --git a/tmpl/popup_main.tt2 b/tmpl/popup_main.tt2
index 5fa87a4..11cfc73 100644
--- a/tmpl/popup_main.tt2
+++ b/tmpl/popup_main.tt2
@@ -1,12 +1,12 @@
-<!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" lang="en" xml:lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
   <head>
-    <base href="[% base_url %]" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <base href="[% base_url %]">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <script type="text/javascript" src="../../js/lxrng-funcs.js"></script>
-    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng" />
+    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng">
 
     <script type="text/javascript">
       var use_ajax_navigation=[% IF is_ajax %]1[% ELSE %]0[% END %];
diff --git a/tmpl/prefs.tt2 b/tmpl/prefs.tt2
index 6246ac6..a7fc223 100644
--- a/tmpl/prefs.tt2
+++ b/tmpl/prefs.tt2
@@ -1,10 +1,10 @@
-<!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" lang="en" xml:lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <script type="text/javascript" src="../../js/lxrng-funcs.js"></script>
-    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng" />
+    <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng">
 
     <title id="title">LXR Preferences</title>
   </head>
@@ -15,6 +15,7 @@
 
       <span class="lxr_title">
 	<span class="lxr_l">l</span><span class="lxr_x">x</span><span class="lxr_r">r</span>
+	Personal preferences for this LXRng site
       </span>
 
       <div class="lxr_menu">
@@ -23,19 +24,18 @@
       <div class="headingbottom"></div>
     </div>
 
-    <div class="pref_heading">Personal preferences for this LXRng site</div>
-
+    <p>
     <form method="post" action="+prefs">
       <div>
-      <input type="hidden" name="return" value="[% return %]" />
+      <input type="hidden" name="return" value="[% return %]">
       Where do you want your search results to be displayed?
       <ol>
 	<li><input type="radio" name="resultloc" value="replace"
-	  [% IF is_replace %]checked[% END %]/>
+	  [% IF is_replace %]checked[% END %]>
 	Replace the active source browsing window</li>
 
 	<li><input type="radio" name="resultloc" value="popup"
-	  [% IF is_popup %]checked[% END %]/>
+	  [% IF is_popup %]checked[% END %]>
 	Show them in a popup window (requires JavaScript enabled)<br>
 
 	<font size="-1"><em>If your browser limits the ability to
@@ -46,11 +46,12 @@
 	behind other windows after use.</em></font></li>
 
 	<li><input type="radio" name="resultloc" value="ajax"
-	  [% IF is_ajax %]checked[% END %]/>
+	  [% IF is_ajax %]checked[% END %]>
 	Show them inside the active source browsing window
 	(requires JavaScript enabled)
 	</li>
       </ol>
+      </p>
       <p>
 	(Cookies need to be enabled for LXR preferences to take effect.)
       </p>
diff --git a/tmpl/prefs_set.tt2 b/tmpl/prefs_set.tt2
index 735e700..47c82d0 100644
--- a/tmpl/prefs_set.tt2
+++ b/tmpl/prefs_set.tt2
@@ -1,8 +1,8 @@
-<!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" lang="en" xml:lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
   <head>
-    <meta http-equiv="refresh" content="0;url=[% return %]" />
+    <meta http-equiv="refresh" content="0;url=[% return %]">
   </head>
   <body onload="location.href='[% return %]';">
     <small><a href="[% return %]">Return to the source...</a></small>
diff --git a/tmpl/release_select.tt2 b/tmpl/release_select.tt2
index fc51500..2e12023 100644
--- a/tmpl/release_select.tt2
+++ b/tmpl/release_select.tt2
@@ -1,4 +1,4 @@
-<select name="v" id="ver_list" 
+<select name="v" id="v" 
 onchange="update_version(this, '[% context.base_url %]', '[% context.tree %]', '[% context.default_release %]', '[% context.path %]');">
   [% FOREACH v = context.all_releases %]
   <option value="[% v %]"
diff --git a/tmpl/tree_list.tt2 b/tmpl/tree_list.tt2
new file mode 100644
index 0000000..deb0237
--- /dev/null
+++ b/tmpl/tree_list.tt2
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <script type="text/javascript" src="../js/lxrng-funcs.js"></script>
+    <link rel="stylesheet" href="../css/lxrng.css" type="text/css" title="LXRng">
+
+    <title id="title">LXR Inventory</title>
+  </head>
+  <body>
+
+    <div class="heading">
+      <div class="headingtop"></div>
+
+      <span class="lxr_title">
+	<span class="lxr_l">l</span><span class="lxr_x">x</span><span class="lxr_r">r</span>
+      Inventory for this LXRng site
+      </span>
+
+      <div class="lxr_menu">
+	<span class="lxr_prefs">
+	<a href="+trees/+prefs?return=..">Prefs</a>
+	</span>
+      </div>
+      <div class="headingbottom"></div>
+    </div>
+
+    <p>
+    <ul>
+      <li><a href="linux">Linux 2.6.11 -</a>
+      <li><a href="linux-bk">Linux 2.5.0 - 2.6.11</a>
+      <li><a href="linux-old">Linux 0.01 - 2.4.31</a>
+      <li><a href="linuxbiosv2">LinuxBIOS v2</a>
+    </ul>
+    </p>
+  </body>
+</html>
+[% INCLUDE footer.tt2 %]