aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2012-08-05 23:04:47 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2012-08-05 23:04:47 +0000
commit06cf1a8309396a16d752fab90f276d909849f636 (patch)
treee73eae9ac6950f748ec41fb004dc885c4ab45791
parent5a7bdd7b8b5e019f1ba4f71a68e2f7014d53f169 (diff)
downloaddoc-06cf1a8309396a16d752fab90f276d909849f636.tar.gz
doc-06cf1a8309396a16d752fab90f276d909849f636.zip
- XMLify the multimedia section
- Fix the clean target while here Approved by: doceng (implicit)
Notes
Notes: svn path=/projects/sgml2xml/; revision=39325
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/Makefile2
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro6
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia.pl22
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro2
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post1
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre18
6 files changed, 28 insertions, 23 deletions
diff --git a/en_US.ISO8859-1/htdocs/multimedia/Makefile b/en_US.ISO8859-1/htdocs/multimedia/Makefile
index 44dd54808e..6fcd8a8a80 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/Makefile
+++ b/en_US.ISO8859-1/htdocs/multimedia/Makefile
@@ -26,7 +26,7 @@ TEMPLATES= multimedia.sgml.intro \
multimedia-input.xml
clean:
- ${RM} -rf output
+ ${RM} -rf output ${CLEANFILES}
build:
${MKDIR} -p output && \
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro b/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro
index a038f981a9..7c027582d4 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.html.intro
@@ -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>
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl b/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
index aa5938fbc6..a3ea062577 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
@@ -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";
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro
index bada76223f..b7072d6d6d 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.intro
@@ -13,7 +13,7 @@ via <a href="sources.html">the sources</a>.
<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>
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post
index 8fdd57e712..c9efd30858 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.post
@@ -1,4 +1,3 @@
- &footer;
</body>
</html>
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre
index baf39aaeb2..5cc31b413b 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.sgml.pre
@@ -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">