recent_list.wml and double quotes in titles
recent_list.wml doesn't parse escaped double quotes in news titles
properly (e. g. take a look at <http://www.debian.org/News/1997/> and
you'll see `\"' in some titles). Instead of adding another kludge, I
suggest modifying basic.wml to remove the need for escaping in
page titles:
--- english.orig/template/debian/basic.wml Wed Mar 17 11:38:41 1999
+++ english/template/debian/basic.wml Thu Mar 18 11:24:59 1999
@@ -44,12 +44,7 @@
{: [[s/—/--/g]] [[s/–/-/g]] [[s/&[lr]dquo;/"/g]] [[s/‘/`/g]] [[s/’/'/g]]
<HEAD>
-<: if ("$(BARETITLE)" eq "" ) {
- print "<TITLE>Debian GNU/Linux -- $(title)</TITLE>\n";
- } else {
- print "<TITLE>$(title)</TITLE>\n";
- }
-:>
+<TITLE>$(BARETITLE:*Debian GNU/Linux -- )$(title)</TITLE>
<LINK REV="made" HREF="mailto:webmaster@debian.org";>
<META http-equiv="Content-Type" content="text/html; charset=$(CHARSET)">
<META NAME="Description" CONTENT="<blurb>">
The full patch (which also removes existing kludges) is attached to
this message. What do you think about it? Is it OK if I commit it
to CVS (and change the affected news pages, of course)?
diff -ru english.orig/template/debian/basic.wml english/template/debian/basic.wml
--- english.orig/template/debian/basic.wml Wed Mar 17 11:38:41 1999
+++ english/template/debian/basic.wml Thu Mar 18 11:24:59 1999
@@ -44,12 +44,7 @@
{: [[s/—/--/g]] [[s/–/-/g]] [[s/&[lr]dquo;/"/g]] [[s/‘/`/g]] [[s/’/'/g]]
<HEAD>
-<: if ("$(BARETITLE)" eq "" ) {
- print "<TITLE>Debian GNU/Linux -- $(title)</TITLE>\n";
- } else {
- print "<TITLE>$(title)</TITLE>\n";
- }
-:>
+<TITLE>$(BARETITLE:*Debian GNU/Linux -- )$(title)</TITLE>
<LINK REV="made" HREF="mailto:webmaster@debian.org";>
<META http-equiv="Content-Type" content="text/html; charset=$(CHARSET)">
<META NAME="Description" CONTENT="<blurb>">
diff -ru english.orig/template/debian/news.wml english/template/debian/news.wml
--- english.orig/template/debian/news.wml Wed Mar 17 11:39:00 1999
+++ english/template/debian/news.wml Thu Mar 18 11:24:59 1999
@@ -5,7 +5,7 @@
#use wml::debian::basic title="<news> -- <pagetitle>"
#use wml::debian::languages
-<H2><:= "<pagetitle>" :></H2>
+<H2><pagetitle></H2>
<P><tt><release_date></tt><br>
<<mainbody>>
diff -ru english.orig/template/debian/news_index.wml english/template/debian/news_index.wml
--- english.orig/template/debian/news_index.wml Sun Jan 31 14:04:12 1999
+++ english/template/debian/news_index.wml Thu Mar 18 11:37:40 1999
@@ -18,7 +18,7 @@
$date = ''; $title = '';
foreach $line (<FILE>) {
if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
- $title = eval("\"$1\"");
+ $title = $1;
}
elsif ($line =~ /^<define-tag release_date>(.*)<\/define-tag>$/) {
$date = $1;
diff -ru english.orig/template/debian/recent_list.wml english/template/debian/recent_list.wml
--- english.orig/template/debian/recent_list.wml Tue Mar 9 10:06:09 1999
+++ english/template/debian/recent_list.wml Thu Mar 18 11:41:50 1999
@@ -91,19 +91,19 @@
$date = ''; $title = ''; $desc = '';
foreach $line (<FILE>) {
if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
- $title = qq/$1/;
+ $title = $1;
}
elsif ($line =~ /^<define-tag release_date>(.*)<\/define-tag>$/) {
- $date = qq/$1/;
+ $date = $1;
}
elsif ($line =~ /^<define-tag report_date>(.*)<\/define-tag>$/) {
- $date = qq/$1/;
+ $date = $1;
}
elsif ($line =~ /^<define-tag date>(.*)<\/define-tag>$/) {
- $date = qq/$1/;
+ $date = $1;
}
elsif ($line =~ /^<define-tag description>(.*)<\/define-tag>$/) {
- $desc = qq/$1/;
+ $desc = $1;
}
if ($title && $date && $desc) {
$str1 = "$elemhead<tt>[$date]</tt> <strong><a href=\"$year/$base\">$title</a></strong> - $elemfoot$desc<br>\n";
diff -ru english.orig/template/debian/recent_news.wml english/template/debian/recent_news.wml
--- english.orig/template/debian/recent_news.wml Sun Jan 31 14:03:08 1999
+++ english/template/debian/recent_news.wml Thu Mar 18 11:37:47 1999
@@ -21,7 +21,7 @@
$date = ''; $title = '';
foreach $line (<FILE>) {
if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
- $title = eval("\"$1\"");
+ $title = $1;
}
elsif ($line =~ /^<define-tag release_date>(.*)<\/define-tag>$/) {
$date = $1;
diff -ru english.orig/template/debian/security.wml english/template/debian/security.wml
--- english.orig/template/debian/security.wml Sat Mar 6 16:34:03 1999
+++ english/template/debian/security.wml Thu Mar 18 11:36:41 1999
@@ -63,7 +63,7 @@
</define-tag>
<P>
- <STRONG><FONT SIZE="+2"><:= "<pagetitle>" :></FONT></STRONG>:
+ <STRONG><FONT SIZE="+2"><pagetitle></FONT></STRONG>:
<FONT SIZE="+1"><description></FONT>
</P>
<HR>
Reply to: