Ready to ship.

diff --git a/Makefile b/Makefile
index d223194e2aaf6e84429c15da556b017d09310e8f..09c247eaf78200ef48fee65467bb2d0eaf3fb721 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ uninstall:
        rm /usr/bin/ascii
        rm /usr/man/man1
 
-SOURCES = README Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen
+SOURCES = README Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen ascii.cgi
 
 ascii-$(VERS).tar.gz: $(SOURCES)
        @ls $(SOURCES) | sed s:^:ascii-$(VERS)/: >MANIFEST

diff --git a/ascii.c b/ascii.c
index 2e92a02d9bac54578e679adf72ca406c5b14957a..d94207f2c3026b09d9bdb60b64d6188166baedd8 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -13,6 +13,7 @@
  *     v2.5 December 1998  -- -s option by David N. Welton.
  *     v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
  *     v2.7 October 1999   -- minor packaging and option changes.
+ *     v3.0 July 2000      -- added HTML/SGML entity sames
  *
  * Tries to interpret arguments as names or aliases of ascii characters
  * and dumps out *all* the aliases of each. Accepts literal characters,
@@ -43,7 +44,7 @@ enum { decimal, hex, octal } mode;
 
 void print_table(unsigned short delivery);
 
-static string cnames[128][15] =
+static string cnames[128][16] =
 {
     {"NUL",            "Null",                 (char *)NULL},
     {"SOH",            "Start Of Heading",     (char *)NULL},
@@ -86,6 +87,7 @@ static string cnames[128][15] =
     {"\"",             "Quotation Mark",
                                "Double Quote", "Quote", "String Quote",
                                "Dirk", "Literal Mark", "Double Glitch",
+                               """,
                                "# See ' and ` for matching names.",
                                (char *)NULL},
     {"#",              "Number Sign",
@@ -98,7 +100,7 @@ static string cnames[128][15] =
     {"%",              "Percent Sign",
                                "Mod", (char *)NULL},
     {"&",              "Ampersand",
-                               "Amper", "And", (char *)NULL},
+                               "Amper", "And", "&", (char *)NULL},
     {"'",              "Apostrophe",
                                "Single Quote", "Close Quote",  "Prime",
                                "Tick", "Pop", "Spark", "Glitch",
@@ -149,7 +151,7 @@ static string cnames[128][15] =
     {"<",              "Less-than Sign",
                                "Left Angle Bracket", "Read From", "In",
                                "From", "Comesfrom", "Left Funnel",
-                               "Left Broket", "Crunch", "Suck",
+                               "Left Broket", "Crunch", "Suck", "&lt;", 
                                "# See `<' for matching names.",
                                 (char *)NULL},
     {"=",              "Equals Sign",
@@ -158,7 +160,7 @@ static string cnames[128][15] =
     {">",              "Greater-than sign",
                                "Right Angle" , "Write To", "Into", "Toward",
                                "Out", "To", "Gozinta", "Right Funnel",
-                               "Right Broket", "Zap", "Blow",
+                               "Right Broket", "Zap", "Blow", "&gt;",
                                "# See `>' for matching names.",
                                 (char *)NULL},
     {"?",              "Question Mark",

diff --git a/ascii.spec b/ascii.spec
index 7d4aed5c8d7aa8a097331668f374a30024db92b8..2a4166ff22aa6deeae2f21c72291e9d10535f1dd 100644 (file)
--- a/ascii.spec
+++ b/ascii.spec
@@ -1,5 +1,5 @@
 Name: ascii
-Version: 2.7
+Version: 3.0
 Release: 1
 Source: locke.ccil.org:/pub/esr/ascii-2.7.tar.gz
 Copyright: distributable

diff --git a/ascii.xml b/ascii.xml
index 9469367bc14388a49ecd72f90b6b49a3281faf07..9832d83f83b84cdf84d271ed1e471423aaea764a 100644 (file)
--- a/ascii.xml
+++ b/ascii.xml
@@ -54,6 +54,9 @@ Its full ISO official name in English.
 Its ISO/ECMA code table reference.
 .TP 3
 *
+Its name as an HTML/SGML entity.
+.TP 3
+*
 Slang and other names in wide use for it among hackers.
 .P
 This utility accepts command-line strings and tries to interpret them as
@@ -124,10 +127,12 @@ a slash, and one or two decimal digit characters.
 An official ASCII or slang name.
 .P
 The slang names recognized and printed out are from a rather comprehensive
-list that appeared on USENET in early 1990.
+list that first appeared on USENET in early 1990 and has been
+continuously updated since.
 Mnemonics recognized and printed include the official ASCII set,
 some official ISO names (where those differ)
 and a few common-use alternatives (such as NL for LF).
+HTML/SGML entity names are also printed when applicable.
 All comparisons are
 case-insensitive, and dashes are mapped to spaces.
 Any unrecognized arguments or out of range values are silently ignored.
@@ -153,3 +158,5 @@ Brian J. Ginsbach <ginsbach@sgi.com> fixed several bugs and expanded the
 man page.
 David N. Welton <davidw@efn.org> added the -s option.
 Matej Vela corrected the ISO names.
+Dave Capella contributed the idea of listing HTML/SGML entities.
+