[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-womb] gnumaint Makefile gnupackages.txt gm
From: |
Karl Berry |
Subject: |
[commit-womb] gnumaint Makefile gnupackages.txt gm |
Date: |
Sun, 07 Aug 2011 23:23:17 +0000 |
CVSROOT: /sources/womb
Module name: gnumaint
Changes by: Karl Berry <karl> 11/08/07 23:23:17
Modified files:
. : Makefile gnupackages.txt gm
Log message:
appease XHTML
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.41&r2=1.42
Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Makefile 4 Mar 2011 22:54:24 -0000 1.32
+++ Makefile 7 Aug 2011 23:23:16 -0000 1.33
@@ -1,17 +1,18 @@
-# $Id: Makefile,v 1.32 2011/03/04 22:54:24 karl Exp $
+# $Id: Makefile,v 1.33 2011/08/07 23:23:16 karl Exp $
# Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved.
-default: test-genlhtml
+default: test-genmhtml
test-genlhtml ghtml: # result included from www.gnu.org/graphics/manual.html
gm generate logos html | tee ~/tmp/x.html
test-genmhtml mhtml: # result included from www.gnu.org/manual/manual.html
gm generate manual html | tee ~/tmp/x.html
+ #scp -q ~/tmp/x.html c2:/u/karl/gnu/www/manual/allgnupkgs.html
test-genphtml shtml: # result included from www.gnu.org/software/software.html
gm generate packages html
Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- gnupackages.txt 5 Aug 2011 17:24:19 -0000 1.93
+++ gnupackages.txt 7 Aug 2011 23:23:16 -0000 1.94
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.93 2011/08/05 17:24:19 karl Exp $
+# $Id: gnupackages.txt,v 1.94 2011/08/07 23:23:16 karl Exp $
# Public domain.
#
# This file records information on a per-package basis, *not* including
@@ -2126,7 +2126,9 @@
activity-status: ok 20101009 (1.2.6)
package: mediagoblin
+logo: http://mediagoblin.org/i/mediagoblin_mascot_attempt1.png
doc-category: Internet
+doc-summary: Photo and media sharing
doc-url: http://docs.mediagoblin.org/
gplv3-status: ok
activity-status: new 20110804
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gm 15 May 2011 15:34:48 -0000 1.41
+++ gm 7 Aug 2011 23:23:17 -0000 1.42
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: gm,v 1.41 2011/05/15 15:34:48 karl Exp $
+# $Id: gm,v 1.42 2011/08/07 23:23:17 karl Exp $
# GNU maintainer-related operations.
#
# Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation Inc.
@@ -283,6 +283,9 @@
push (@ret, &output_category_list (%cat));
push (@ret, "<table>");
+ push (@ret, qq!<col width="24%" />!); # <td width=...> disallowed in XHTML.
+ push (@ret, qq!<col width="74%" />!);
+
# Sort first by full category name, since the abbreviations sometimes
# start with a completely different string (Libraries -> Software
# libraries). Then, for each category, sort list of packages and output.
@@ -312,9 +315,15 @@
$doc_urls{$pkgname} = $home_url;
}
+ # have to replace & with & for XHTML.
+ for my $manual (keys %doc_urls) {
+ (my $doc_url_xhtml = $doc_urls{$manual}) =~ s,\&,\&,g;
+ $doc_urls{$manual} = $doc_url_xhtml;
+ }
+
# start building output string for this package.
# first column is the package name and additional manuals.
- my $str = qq!\n<tr><td width="24%">* !;
+ my $str = qq!\n<tr><td>* !;
# the main package identifier and its doc url. If we have a
# mundane name, use it. Otherwise, prettify the pkg identifier.
@@ -330,7 +339,7 @@
for my $manual (keys %doc_urls) {
next if $manual eq $pkgname; # already took care of that
push (@more_manuals,
- sprintf (qq!<a href="%s">$manual</a>!, $doc_urls{$manual}));
+ sprintf (qq!<a href="%s">$manual</a>!, $doc_url_xhtml));
}
if (@more_manuals) {
$str .= "\n<small>(";
@@ -345,7 +354,7 @@
my $shop = &find_shop_urls (%p);
my $home = qq!\n [<a href="$home_url">$pkgname home</a>]!;
- $str .= qq! <td width="74%">$summary$shop$home!;
+ $str .= qq! <td>$summary$shop$home!;
$str .= "</td></tr>";
push (@ret, $str);
@@ -370,11 +379,11 @@
my ($short_cat,$full_cat,$cat_url) = @_;
my $css = qq!style="padding-top:.8em; padding-left:16%;"!;
my $ret = "\n\n<tr>\n";
- $ret .= qq!<td colspan="2" $css><a id="$short_cat">!;
+ $ret .= qq!<td id="$short_cat" colspan="2" $css>!;
$ret .= qq!<a href="$cat_url">! if $cat_url;
$ret .= "<big><b>$full_cat</b></big>";
$ret .= "</a>" if $cat_url;
- $ret .= "</a></td></tr>";
+ $ret .= "</td></tr>";
return $ret;
}
@@ -454,7 +463,7 @@
my $ret;
my @shop = split (/\|/, $pkg{"doc-shop"});
if (@shop) {
- $ret = "\n <br>Available in print:";
+ $ret = "\n <br/>Available in print:";
# keep same ordering as input.
my @books = ();
for (my $i = 0; $i < @shop; $i += 2) {
@@ -855,11 +864,11 @@
"enterprise" => "gnue",
# "factor" => "coreutils",
# "fileutils" => "coreutils",
- "finger" => "inetutils",
- "fmt" => "coreutils",
- "forth" => "gforth",
- "fortran" => "gfortran",
- "forum" => "dotgnu-forum",
+# "finger" => "inetutils",
+# "fmt" => "coreutils",
+# "forth" => "gforth",
+# "fortran" => "gfortran",
+# "forum" => "dotgnu-forum",
"gar" => "binutils",
"gar960" => "binutils",
"gas" => "binutils",
@@ -877,12 +886,11 @@
"gnu.regexp" => "libc",
"gnu-c" => "gcc",
"gnuchess" => "chess",
- "gnufm" => "librefm",
"gnugsl" => "gsl",
"gnupascal" => "pascal",
"gnus" => "emacs",
"gnuucp" => "uucp",
- "go" => "gnugo",
+# "go" => "gnugo",
"gpc" => "pascal",
"gprof" => "binutils",
"graphics" => "plotutils",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-womb] gnumaint Makefile gnupackages.txt gm,
Karl Berry <=