From owner-svn-doc-head@FreeBSD.ORG  Mon Jun  4 02:27:27 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8FFEB106564A;
	Mon,  4 Jun 2012 02:27:27 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 77B2D8FC1C;
	Mon,  4 Jun 2012 02:27:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q542RROC099103;
	Mon, 4 Jun 2012 02:27:27 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q542RRGw099101;
	Mon, 4 Jun 2012 02:27:27 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201206040227.q542RRGw099101@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 4 Jun 2012 02:27:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r38973 - head/en_US.ISO8859-1/htdocs/multimedia
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the doc tree for head
	<svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 02:27:27 -0000

Author: hrs
Date: Mon Jun  4 02:27:26 2012
New Revision: 38973
URL: http://svn.freebsd.org/changeset/doc/38973

Log:
  - Fix <tags> handling in <files>.
  - Fix counting of the number of tags for font-size: property in the tag list.

Modified:
  head/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl

Modified: head/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl	Sun Jun  3 19:52:21 2012	(r38972)
+++ head/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl	Mon Jun  4 02:27:26 2012	(r38973)
@@ -83,7 +83,7 @@ sub xml_start {
 	$items[$ci]{fc}++;
     }
 
-    if ($treeindex == 3 &&
+    if (($treeindex == 3 || $treeindex == 5) &&
 	$element eq "tags") {
 	$tag = "";
     }
@@ -98,6 +98,11 @@ sub xml_end {
 	@{$items[$ci]{tags}} = split(/,/, $tag);
 	addtags($tag);
     }
+    if ($treeindex == 5 &&
+	$element eq "tags") {
+	@{$items[$ci]{files}{$items[$ci]{fc}}{tags}} = split(/,/, $tag);
+	addtags($tag);
+    }
 
     $values[$treeindex] = ();
     $treeindex--;
@@ -179,9 +184,7 @@ sub xml_char {
 			    return;
 			}
 			if ($tree[5] eq "tags") {
-			    @{$items[$ci]{files}{$items[$ci]{fc}}{tags}} = split(/,/, $value);
-			    addtags($value);
-			    addtags("", $items[$ci]{tags});
+			    $tag .= $value;
 			    return;
 			}
 			goto error;
@@ -432,7 +435,7 @@ sub print_htmlitem {
     }
     my $size = 20;
     my $c = 0;
-    foreach my $tag (sort size(keys(%tags))) {
+    foreach my $tag (sort size keys(%tags)) {
 	my $ftag = $tag;
 	$ftag =~ s/ /_/g;
 	print $fhtml "<font style=\"font-size:${size}pt\"><a href=\"tag-$ftag.html\">$tag</a></font>\n";