From owner-svn-doc-projects@FreeBSD.ORG  Sun Aug  5 23:04:48 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 60CEC106566B;
	Sun,  5 Aug 2012 23:04:48 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AA588FC0A;
	Sun,  5 Aug 2012 23:04:48 +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 q75N4mpP039379;
	Sun, 5 Aug 2012 23:04:48 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75N4mSd039371;
	Sun, 5 Aug 2012 23:04:48 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201208052304.q75N4mSd039371@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 5 Aug 2012 23:04:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39325 -
	projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 23:04:48 -0000

Author: gabor
Date: Sun Aug  5 23:04:47 2012
New Revision: 39325
URL: http://svn.freebsd.org/changeset/doc/39325

Log:
  - XMLify the multimedia section
  - Fix the clean target while here
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/Makefile
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/Makefile
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/Makefile	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/Makefile	Sun Aug  5 23:04:47 2012	(r39325)
@@ -26,7 +26,7 @@ TEMPLATES=	multimedia.sgml.intro \
 		multimedia-input.xml
 
 clean:
-	${RM} -rf output
+	${RM} -rf output ${CLEANFILES}
 
 build:
 	${MKDIR} -p output && \

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro	Sun Aug  5 23:04:47 2012	(r39325)
@@ -6,14 +6,14 @@ of interest for FreeBSD users.
 </p>
 
 <p>
-<br>
+<br/>
 This list is available as <a href="multimedia.html">chronological
 overview</a>, as a <a href="multimedia-tags.html">tag cloud</a> and
 via <a href="multimedia-sources.html">the sources</a>.
 
-<br>
+<br/>
 This list is also available as RSS feed <a href="multimedia.xml"><img
-src="http://www.freebsd.org/layout/images/ico_rss.png"></a>
+src="http://www.freebsd.org/layout/images/ico_rss.png"/></a>
 </p>
 
 <p>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl	Sun Aug  5 23:04:47 2012	(r39325)
@@ -123,12 +123,12 @@ sub xml_char {
 
 		if ($tree[3] eq "title") {
 		    $items[$ci]{title} = "" if (!defined $items[$ci]{title});
-		    $items[$ci]{title} .= $value;
+		    $items[$ci]{title} .= htmlentities($value);
 		    return;
 		}
 		if ($tree[3] eq "desc") {
 		    $items[$ci]{desc} = "" if (!defined $items[$ci]{desc});
-		    $items[$ci]{desc} .= $value;
+		    $items[$ci]{desc} .= htmlentities($value);
 		    return;
 		}
 		if ($tree[3] eq "overview") {
@@ -180,7 +180,7 @@ sub xml_char {
 			if ($tree[5] eq "desc") {
 			    $items[$ci]{files}{$items[$ci]{fc}}{desc} = ""
 				if (!defined $items[$ci]{files}{$items[$ci]{fc}}{desc});
-			    $items[$ci]{files}{$items[$ci]{fc}}{desc} .= $value;
+			    $items[$ci]{files}{$items[$ci]{fc}}{desc} .= htmlentities($value);
 			    return;
 			}
 			if ($tree[5] eq "tags") {
@@ -283,26 +283,26 @@ sub print_htmlitem {
 	    print $fhandle ")";
 	}
     }
-    print $fhandle "<br>Source: <a href=\"", htmlentities($source{url}), "\">",
-	$source{name}, "</a><br>\n";
+    print $fhandle "<br/>Source: <a href=\"", htmlentities($source{url}), "\">",
+	$source{name}, "</a><br/>\n";
     print $fhandle "Added: ",
 	    substr($item{added}, 6, 2), " ",
 	    $months[substr($item{added}, 4, 2)], " ",
-	    substr($item{added}, 0, 4), "<br>\n";
+	    substr($item{added}, 0, 4), "<br/>\n";
 
     print $fhandle "Tags: ";
     {
 	my $first = 1;
 	foreach my $t (@{$item{tags}}) {
 	    print $fhandle ", " if (!$first);
-#	    join(", ", @{$item{$t}}), "<br>\n";
+#	    join(", ", @{$item{$t}}), "<br/>\n";
 	    my $th = $t;
 	    $th =~ s/ /_/g;
 	    print $fhandle "<a href=\"tag-$th.html\">$t</a>";
 	    $first = 0;
 	}
     }
-    print $fhandle "<br>\n";
+    print $fhandle "<br/>\n";
 
     if (defined $item{overview} && defined $item{files}) {
 	my $c = 0;
@@ -328,7 +328,7 @@ sub print_htmlitem {
 		print $fhandle ")";
 	    }
 	}
-	print $fhandle "<br>\n";
+	print $fhandle "<br/>\n";
     }
     print $fhandle "</p>\n";
     print $fhandle "$item{desc}\n";
@@ -581,8 +581,8 @@ sub print_htmlitem {
 	next if ($lastsource eq $item{source});
 	$lastsource = $item{source};
 
-	print $fhtml "<li><a href=\"source-$lastsource.html\">", $sources{$item{source}}{name}, "</a>\n";
-	print $fsgml "<li><a href=\"source-$lastsource.html\">", $sources{$item{source}}{name}, "</a>\n";
+	print $fhtml "<li><a href=\"source-$lastsource.html\">", $sources{$item{source}}{name}, "</a></li>\n";
+	print $fsgml "<li><a href=\"source-$lastsource.html\">", $sources{$item{source}}{name}, "</a></li>\n";
     }
 
     print $fhtml "</ul>\n";

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro	Sun Aug  5 23:04:47 2012	(r39325)
@@ -13,7 +13,7 @@ via <a href="sources.html">the sources</
 
 <p>
 This list is also available as RSS feed <a href="multimedia.xml"><img
-src="http://www.freebsd.org/layout/images/ico_rss.png" alt="RSS Feed"></a>
+src="http://www.freebsd.org/layout/images/ico_rss.png" alt="RSS Feed"/></a>
 </p>
 
 <p>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post	Sun Aug  5 23:04:47 2012	(r39325)
@@ -1,4 +1,3 @@
-    &footer;
   </body>
 </html>
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre	Sun Aug  5 22:18:26 2012	(r39324)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre	Sun Aug  5 23:04:47 2012	(r39325)
@@ -1,8 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD$">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Multimedia">
-<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY base "..">
 ]>
-<html>
-    &header;
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.about">