Lots of support for extra stuff in the licensing notice. Now have

separate upper- and lower-case program names, and so on.  Projects
without titles have sensible defaults rather than irritating interactive
prompts.

diff --git a/skelrc b/skelrc
index 53922de..4463427 100644 (file)
--- a/skelrc
+++ b/skelrc
@@ -26,38 +26,44 @@
     (if endind (substring name 0 endind)
       (name))))
 
-(setq skelrc-gpl
+(defun skelrc-assq (key list)
+  (let ((val (assq key list)))
+    (and val (cdr val))))
+
+(defun skelrc-component ()
+  (if (assq 'full-title skel-alist)
 "[[cont-comment]] This file is part of [[full-title]].
-[[cont-comment]]
-[[cont-comment]] [[program]] is free software; you can redistribute it and/or modify
+[[cont-comment]]\n"
+    ""))
+
+(setq skelrc-gpl
+"[[cont-comment]] [[Program-name]] is free software; you can redistribute it and/or modify
 [[cont-comment]] it under the terms of the GNU General Public License as published by
 [[cont-comment]] the Free Software Foundation; either version 2 of the License, or
 [[cont-comment]] (at your option) any later version.
 [[cont-comment]] 
-[[cont-comment]] [[program]] is distributed in the hope that it will be useful,
+[[cont-comment]] [[Program-name]] is distributed in the hope that it will be useful,
 [[cont-comment]] but WITHOUT ANY WARRANTY; without even the implied warranty of
 [[cont-comment]] MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 [[cont-comment]] GNU General Public License for more details.
 [[cont-comment]] 
 [[cont-comment]] You should have received a copy of the GNU General Public License
-[[cont-comment]] along with [[program]]; if not, write to the Free Software Foundation,
+[[cont-comment]] along with [[program-name]]; if not, write to the Free Software Foundation,
 [[cont-comment]] Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.")
 
 (setq skelrc-lgpl
-"[[cont-comment]] This file is part of [[full-title]].
-[[cont-comment]]
-[[cont-comment]] [[program]] is free software; you can redistribute it and/or modify
+"[[cont-comment]] [[Library-name]] is free software; you can redistribute it and/or modify
 [[cont-comment]] it under the terms of the GNU Library General Public License as
-[[cont-comment]]  published by the Free Software Foundation; either version 2 of the
+[[cont-comment]] published by the Free Software Foundation; either version 2 of the
 [[cont-comment]] License, or (at your option) any later version.
 [[cont-comment]] 
-[[cont-comment]] [[program]] is distributed in the hope that it will be useful,
+[[cont-comment]] [[Library-name]] is distributed in the hope that it will be useful,
 [[cont-comment]] but WITHOUT ANY WARRANTY; without even the implied warranty of
 [[cont-comment]] MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 [[cont-comment]] GNU Library General Public License for more details.
 [[cont-comment]] 
 [[cont-comment]] You should have received a copy of the GNU Library General Public
-[[cont-comment]] License along with [[program]]; if not, write to the Free Software
+[[cont-comment]] License along with [[library-name]]; if not, write to the Free Software
 [[cont-comment]] Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.")
 
 (defun skel-basename ()
@@ -69,9 +75,23 @@
         (year . (substring (current-time-string) 20 24))
         (header . "[[licence]][[revisions]][[preamble]]")
         (basename . (skel-basename))
-        (licence . "[[licence-banner]]\n[[cont-comment]]\n[[licence-text]][[block-end]]\n\n")
+        (licence . "[[licence-banner]]\n[[cont-comment]]\n[[component]][[licence-text]][[block-end]]\n\n")
         (licence-banner . (skelrc-banner "Licensing notice" t))
+        (component . (skelrc-component))
         (licence-text . "[[gpl]]")
+        (Program-name . (or (skelrc-assq 'Program skel-alist)
+                            (skelrc-assq 'program skel-alist)
+                            "This program"))
+        (program-name . (or (skelrc-assq 'program skel-alist)
+                            "this program"))
+        (Library-name . (or (skelrc-assq 'Library skel-alist)
+                            (skelrc-assq 'library skel-alist)
+                            (skelrc-assq 'Program skel-alist)
+                            (skelrc-assq 'program skel-alist)
+                            "This library"))
+        (library-name . (or (skelrc-assq 'library skel-alist)
+                            (skelrc-assq 'program skel-alist)
+                            "this library"))
         (gpl . skelrc-gpl)
         (lgpl . skelrc-lgpl)
         (revisions . "[[revision-banner]]\n[[cont-comment]]\n[[cont-comment]] $Log$[[block-end]]\n\n")