[commit-womb] gnumaint gm-generate.pl gm-util.pl pkgblurbs.txt

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     13/10/14 17:10:56

Modified files:
        .              : gm-generate.pl gm-util.pl pkgblurbs.txt 

Log message:
        capitalization, XHTML package identifiers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-util.pl?cvsroot=womb&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnumaint/pkgblurbs.txt?cvsroot=womb&r1=1.7&r2=1.8

Patches:
Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gm-generate.pl      14 Oct 2013 16:58:25 -0000      1.9
+++ gm-generate.pl      14 Oct 2013 17:10:55 -0000      1.10
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.9 2013/10/14 16:58:25 karl Exp $
+# $Id: gm-generate.pl,v 1.10 2013/10/14 17:10:55 karl Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013
@@ -148,8 +148,7 @@
       # first column is the package name and additional manuals.
       # Add an id for each package for easy linking;
       # but XHTML, as usual, introduces gratuitious problems.
-      (my $xhtml_id = $pkgname) =~ s/[^-_0-9a-z]//g;        # identifier chars
-      $xhtml_id = "pkg_$xhtml_id" if $xhtml_id !~ /^[a-z]/; # start w/letter
+      my $xhtml_id = &xhtml_id ($pkgname);
       my $str = qq!\n<tr id="$xhtml_id"><td>* !;
       
       # the main package identifier and its doc url.  If we have a
@@ -355,9 +354,11 @@
     # we intentionally omit blurbs for some packages.
     next if $pkg{"blurb"} =~ /^null/;
     
+    my $xhtml_id = &xhtml_id ($pkgname);
+
     # this ssi stuff lets the homepage extract a single blurb to display.
     push (@ret, qq!\n<--#if expr="\$pkg_selection = /:$pkgname:/" -->!);
-    push (@ret, qq!<h4 id="$pkgname">!
+    push (@ret, qq!<h4 id="$xhtml_id">!
               . qq!<a href="/software/$pkgname/">$pkglabel</a></h4>!);
     my $blurb = $pkg{"blurb"};
     
@@ -365,7 +366,7 @@
     if (length ($blurb) < 70) {
       my @words = split (" ", $blurb);
       if ($words[0] eq "redirect") {
-        my $target = $words[1];
+        my $target = &xhtml_id ($words[1]);
         if (length ($target) <= 1) {
           warn "$msgprefix: redirection target too short: $target\n";
           next;

Index: gm-util.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-util.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gm-util.pl  8 Feb 2013 19:28:00 -0000       1.5
+++ gm-util.pl  14 Oct 2013 17:10:55 -0000      1.6
@@ -1,4 +1,4 @@
-# $Id: gm-util.pl,v 1.5 2013/02/08 19:28:00 karl Exp $
+# $Id: gm-util.pl,v 1.6 2013/10/14 17:10:55 karl Exp $
 # Utilities for the gm script.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
@@ -87,6 +87,17 @@
 }
 
 
+# our package names don't always suit XHTML in its wisdom.
+# 
+sub xhtml_id {
+  my ($pkgname) = @_;
+  (my $xhtml_id = $pkgname) =~ s/[^-_0-9a-z]//g;        # identifier chars
+  $xhtml_id = "pkg_$xhtml_id"
+    if $xhtml_id !~ /^[a-z]/; # start w/letter
+  return $xhtml_id;
+}
+
+
 # return auto-generation notice to include in output files.
 # 
 sub generated_by_us {

Index: pkgblurbs.txt
===================================================================
RCS file: /sources/womb/gnumaint/pkgblurbs.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pkgblurbs.txt       14 Oct 2013 16:58:27 -0000      1.7
+++ pkgblurbs.txt       14 Oct 2013 17:10:56 -0000      1.8
@@ -1,4 +1,4 @@
-# $Id: pkgblurbs.txt,v 1.7 2013/10/14 16:58:27 karl Exp $
+# $Id: pkgblurbs.txt,v 1.8 2013/10/14 17:10:56 karl Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -14,7 +14,7 @@
 + but it can also create animations containing text typeset by TeX.
 
 package: a2ps
-blurb: a2ps converts almost anything to a PostScript file, ready for
+blurb: GNU a2ps converts almost anything to a PostScript file, ready for
 + printing. It accomplishes this by being able to delegate files to
 + external handlers, such as Groff and Gzip.  It handles as many steps
 + as is necessary to produce a pretty-printed file.  It also includes
@@ -297,7 +297,7 @@
 blurb: null (container for network work)
 
 package: coreutils
-blurb: GNU coreutils includes all of the basic command-line tools that are
+blurb: GNU Coreutils includes all of the basic command-line tools that are
 + expected in a POSIX system.  These provide the basic file, shell and
 + text manipulation functions of the GNU system.  Most of these tools
 + offer extended functionality beyond that which is outlined in the
@@ -384,7 +384,7 @@
 + work, such as sentence length and other readability measures.
 
 package: diffutils
-blurb: GNU diffutils is a package containing tools for finding the
+blurb: GNU Diffutils is a package containing tools for finding the
 + differences between files.  The "diff" command is used to show how two
 + files differ, while "cmp" shows the offsets and line numbers where they
 + differ.  "diff3" allows you to compare three files.  Finally, "sdiff"
@@ -498,11 +498,11 @@
 + long arguments.
 
 package: fontutils
-blurb: GNU fontutils is a set of utilities for manipulating fonts.  For
-+ example, you can convert scanned images of characters into bitmaps,
-+ you can hand-edit the bitmaps, or you can convert them into outline
-+ fonts.  In general, Fontutils supports the font formats supported by
-+ the TeX typesetting environment, include PostScript Type 1 fonts.
+blurb: GNU Fontutils is a collection of programs for handling fonts.
++ Bitmaps can be extracted from scanned images of characters, edited,
++ and converted into outline fonts.  In general, Fontutils supports the
++ font formats supported by the TeX typesetting environment, including
++ PostScript Type 1 fonts.
 
 package: freedink
 blurb: GNU FreeDink is a free and portable re-implementation of the engine
@@ -1019,7 +1019,7 @@
 + searching.
 
 package: gretl
-blurb: GNU gretl is a package for performing statistical computations for
+blurb: GNU Gretl is a package for performing statistical computations for
 + econometrics.  It consists of both a command-line client and a
 + graphical client.  It features a variety of estimators such as
 + least-squares and maximum likelihood; several time series methods such
@@ -1471,7 +1471,7 @@
 + bounce processing, content filtering, digest delivery, and more.
 
 package: mailutils
-blurb: GNU mailutils is a collection of programs for managing, viewing
+blurb: GNU Mailutils is a collection of programs for managing, viewing
 + and processing electronic mail.  It contains both utilities and server
 + daemons and all operate in a protocol-agnostic way.  The underlying
 + libraries are also available, simplifying the addition of mail
@@ -1555,14 +1555,14 @@
 blurb: redirect hurd
 
 package: miscfiles
-blurb: GNU miscfiles is a collection of common data files.  They
+blurb: GNU Miscfiles is a collection of common data files.  They
 + include, for example, country abbreviations, names and capital cities;
 + currency abbreviations and names; a Best Current Practices index; a map
 + of the ASCII character set; a list of three-letter airport codes; and
 + an English word list.
 
 package: mit-scheme
-blurb: MIT/GNU Scheme is an implementation of the Scheme programming
+blurb: GNU/MIT Scheme is an implementation of the Scheme programming
 + language.  It provides an interpreter, a compiler and a debugger.  It
 + also features an integrated Emacs-like editor and a large runtime
 + library.
@@ -1592,10 +1592,10 @@
 + floating-point computations with correct rounding.
 
 package: mtools
-blurb: GNU mtools is a set of tools for accessing MS-DOS disks from within the
-+ GNU system.  It supports long file names and multiple disk formats.
-+ It also supports some FAT-specific features such as volume labels and
-+ FAT-specific file attributes.
+blurb: GNU Mtools is a set of utilities for accessing MS-DOS disks from
++ a GNU or Unix system.  It supports long file names and multiple disk
++ formats.  It also supports some FAT-specific features such as volume
++ labels and FAT-specific file attributes.
 
 package: myserver
 blurb: GNU MyServer is a powerful web server that is straightforward to
@@ -1610,19 +1610,19 @@
 + or runtime.
 
 package: nano
-blurb: GNU nano is a small and simple text editor.  In addition to basic
+blurb: GNU Nano is a small and simple text editor.  In addition to basic
 + editing, it supports interactive search and replace, go to line and
 + column number, auto-indentation and more.
 
 package: ncurses
-blurb: GNU ncurses is a library which provides capabilities to write text to a
+blurb: GNU Ncurses is a library which provides capabilities to write text to a
 + terminal in a terminal-independent manner.  It supports pads and
 + color as well as multiple highlights and forms characters.  It is
 + typically used to implement user interfaces for command-line
 + applications.  The accompanying ncursesw library provides wide character
 + support.
 
-package: nettle
+package: Nettle
 blurb: GNU nettle is a low-level cryptographic library.  It is designed to fit
 + in easily in almost any context.  It can be easily included in
 + cryptographic toolkits for object-oriented languages or in
@@ -1632,7 +1632,7 @@
 blurb: null (container for network work)
 
 package: ocrad
-blurb: GNU ocrad is an optical character recognition program based on a feature
+blurb: GNU Ocrad is an optical character recognition program based on a feature
 + extraction method.  It can read images in PBM, PGM or PPM formats and
 + it produces text in 8-bit or UTF-8 formats.
 
@@ -1665,7 +1665,7 @@
 + mapping, and several lighting effects.
 
 package: parallel
-blurb: GNU parallel is a tool for executing shell jobs in parallel using one
+blurb: GNU Parallel is a tool for executing shell jobs in parallel using one
 + or more computers.  Jobs can consist of single commands or of scripts
 + and they are executed on lists of files, hosts, users or other items.
 
@@ -1897,7 +1897,7 @@
 + checksums.
 
 package: shishi
-blurb: GNU shishi is a free implementation of the Kerberos 5 network security
+blurb: GNU Shishi is a free implementation of the Kerberos 5 network security
 + system.  It is used to allow non-secure network nodes to communicate
 + in a secure manner through client-server mutual authentication via
 + tickets.
@@ -1995,7 +1995,7 @@
 + interface.
 
 package: superopt
-blurb: GNU superopt is a function sequence generator for superoptimization.  It
+blurb: GNU Superopt is a function sequence generator for superoptimization.  It
 + uses an exhaustive generate-and-test approach to find the shortest
 + instruction sequence for a given function.
 
@@ -2032,14 +2032,15 @@
 + database.
 
 package: termutils
-blurb: GNU termutils contains two programs, "tput" and "tabs".  "tput"
-+ is used in shell scripts to manipulate the terminal display, for
-+ example by clearing it or moving the cursor to a specific point,
-+ centering text or underlining text.  "tabs" is used to specify and set
-+ hardware tab stops on terminals that support it.
+
+blurb: The GNU Termutils package contains two programs, "tput" and
++ "tabs".  "tput" is used in shell scripts to manipulate the terminal
++ display, for example by clearing it or moving the cursor to a specific
++ point, centering text or underlining text.  "tabs" is used to specify
++ and set hardware tab stops on terminals that support it.
 
 package: teseq
-blurb: GNU teseq is a program that analyzes files that contain control
+blurb: GNU Teseq is a program that analyzes files that contain control
 + sequences.  It converts the sequences that it encounters into a
 + human-readable description of what actions those sequences perform.
 + It can also translate its output back into machine-readable control
@@ -2087,7 +2088,7 @@
 blurb: redirect gnun
 
 package: trueprint
-blurb: GNU trueprint translates C source code files as PostScript files.
+blurb: GNU Trueprint translates C source code files as PostScript files.
 + In addition to the basic source code output, it can also perform
 + diff-marking, indentation counting, function and file indices and
 + more.
@@ -2106,7 +2107,7 @@
 + underlines and strikethroughs, superscripts and subscripts, and more.
 
 package: userv
-blurb: GNU userv is a utility that allows one program to invoke another even
+blurb: GNU Userv is a utility that allows one program to invoke another even
 + when only limited trust exists between them.  This prevents the need
 + from having to first switch to a different user account to perform
 + certain tasks.
@@ -2146,7 +2147,7 @@
 + number of disk operations.
 
 package: wdiff
-blurb: GNU wdiff is a front-end to the diff program from Diffutils that allows
+blurb: GNU Wdiff is a front-end to the diff program from Diffutils that allows
 + you to compare files on a word-by-word basis, where a word is
 + anything between whitespace.
 
@@ -2205,7 +2206,7 @@
 + testing or demonstration purposes.
 
 package: xorriso
-blurb: GNU xorriso is a tool for copying files to and from ISO 9660 Rock
+blurb: GNU Xorriso is a tool for copying files to and from ISO 9660 Rock
 + Ridge, a.k.a. Compact Disc File System, filesystems and it allows
 + session-wise manipulation of them.  It features a formatter and burner
 + for CD, DVD and BD.  It can operate on existing ISO images or it can