Fix a comment bug in the nametable. Improve splashscreen generation.

(The date on this commit is wring because I had to reconstruct after an
unrecoverable SVN error.)

diff --git a/Makefile b/Makefile
index 8d05a87d9f247430153d9087838b16fdd6a1ab98..b3c0cca3383b2e0b24769665aba70c8745620e8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ascii: ascii.c splashscreen.h nametable.h
        $(CC) -DREVISION=$(VERS) ascii.c -o ascii
 
 splashscreen.h: splashscreen
-       sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/' -e 's/.*/puts("&");/' 
+       sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/.*/P("&");/' 
 
 nametable.h: nametable
        sed <nametable >nametable.h -e '/^#/d' -e 's/^[A-Za-z ]*: */    /' -e 's/%%/    }, {/'
@@ -20,7 +20,7 @@ ascii.html: ascii.xml
        xmlto html-nochunks ascii.xml 
 
 clean:
-       rm -f ascii ascii.o splashscreen.h ascii.1 *.rpm *.tar.gz
+       rm -f ascii ascii.o splashscreen.h nametable.h ascii.1 *.rpm *.tar.gz MANIFEST
 
 install: ascii ascii.1
        cp ascii $(DESTDIR)/usr/bin/ascii
@@ -32,13 +32,14 @@ uninstall:
 
 SOURCES = README COPYING Makefile ascii.c ascii.xml ascii.spec splashscreen nametable ascii.cgi
 
+# Assumes this is the trubnk of a Subversion repository
 ascii-$(VERS).tar.gz: $(SOURCES) ascii.1
        @ls $(SOURCES) ascii.1 | sed s:^:ascii-$(VERS)/: >MANIFEST
-       @(cd ..; ln -s ascii ascii-$(VERS))
-       (cd ..; tar -czvf ascii/ascii-$(VERS).tar.gz `cat ascii/MANIFEST`)
+       @(cd ..; ln -s trunk ascii-$(VERS))
+       (cd ..; tar -czvf trunk/ascii-$(VERS).tar.gz `cat trunk/MANIFEST`)
        @(cd ..; rm ascii-$(VERS))
 
 dist: ascii-$(VERS).tar.gz
 
 release: ascii-$(VERS).tar.gz ascii.html
-       shipper -f; rm -f CHANGES ANNOUNCE* ascii.html *.1 *.html *.rpm *.lsm
+       shipper; rm -f CHANGES ANNOUNCE* ascii.html *.1 *.html *.rpm *.lsm

diff --git a/ascii.c b/ascii.c
index 820cecc51781a04b68174263c22ab1ba8326c2d0..884c9c6247e8a6c86bb66b933f8fd04efc4824bc 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -58,7 +58,7 @@ void
 showHelp(FILE *out, char *progname) 
 {
   fprintf(out,"Usage: %s [-dxohv] [-t] [char-alias...]\n", progname); 
-#define P(s)   puts(s);
+#define P(s)   fputs(s, out);
 #include "splashscreen.h"
 #undef P
 

diff --git a/ascii.spec b/ascii.spec
index 6b910cee835231626aa4ed6de5f5404133cf7cb8..9d887a66e7fac9c826b4f8fdd8efba9c3522f600 100644 (file)
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,5 +1,5 @@
 Name: ascii
-Version: 3.6
+Version: 3.7
 Release: 1
 URL: http://www.catb.org/~esr/ascii/
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@ cp ascii.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 %doc README COPYING
 
 %changelog
+* Wed Mar  2 2005 Eric S. Raymond <esr@snark.thyrsus.com> - 3.7-1
+- Fix a comment bug in the nametable. Improve splashscreen generation.
+
 * Sun Jan 11 2004 Eric S. Raymond <esr@snark.thyrsus.com> 3.6-1
 - Fix brown-paper-bag bug in the Space entry.
 

diff --git a/nametable b/nametable
index 50a40b479f980ca43be98f6ddc1e70a35958226c..d875d6f35c7ed2934db71cec87831346de916bbd 100644 (file)
--- a/nametable
+++ b/nametable
@@ -341,7 +341,7 @@ Comments:  "# See `/' for matching names.",
 Mnemonics: "]",
 ISO names: "Right Square Bracket",
 Synonyms:  "Unbracket", "Ket", "Unsquare",
-Comments:  "# See `]' for matching names.",
+Comments:  "# See `[' for matching names.",
 %%
 Mnemonics: "^",
 ISO names: "Circumflex Accent",