Bill Jolitz @ Berkeley received this version from Lorindia Cherry

around September 1981, as the ``most recent version''.  Deltas
seem to be progressive, rather than regressive, although the BTL sid for
deroff.c is retrograde; this is probably a case of parallel development

SCCS-vsn: usr.bin/diction/style1/abbrev.c 4.2
SCCS-vsn: usr.bin/diction/style2/ehash.c 4.2
SCCS-vsn: usr.bin/diction/style2/edict.c 4.2
SCCS-vsn: usr.bin/diction/style1/nhash.c 4.2
SCCS-vsn: usr.bin/diction/style1/dict.c 4.2
SCCS-vsn: usr.bin/diction/style1/ydict.c 4.2
SCCS-vsn: usr.bin/diction/style1/abbrev.c 4.2

diff --git a/usr/src/usr.bin/diction/style1/abbrev.c b/usr/src/usr.bin/diction/style1/abbrev.c
index e69de29..54777a8 100644 (file)
--- a/usr/src/usr.bin/diction/style1/abbrev.c
+++ b/usr/src/usr.bin/diction/style1/abbrev.c
@@ -0,0 +1,70 @@
+#ifndef lint
+static char abbrev_sccsid[] = "@(#)abbrev.c    4.2     (Berkeley)      82/11/06";
+#endif not lint
+
+struct dict abbrev_d[] = {
+"St",'N',
+"Dr",'N',
+"Drs",'N',
+"Mr",'N',
+"Mrs",'N',
+"Ms",'N',
+"Rev",'N',
+"No",'Y',
+"Nos",'Y',
+"NO",'Y',
+"NOs",'Y',
+"no",'Y',
+"Fig",'Y',
+"Figs",'Y',
+"Dept",'Y',
+"Depts",'Y',
+"dept",'Y',
+"depts",'Y',
+"Eq",'Y',
+"Eqs",'Y',
+"eq",'Y',
+"eqs",'Y',
+"dB",'Y',
+"vs",'P',
+"in",'Y',
+"ft",'Y',
+"yr",'Y',
+"ckts",'Y',
+"mi",'Y',
+"Jr",'J',
+"jr",'J',
+"Ch",'Y',
+"ch",'Y',
+"Ref",'Y',
+"Refs",'Y',
+"ref",'Y',
+"refs",'Y',
+"Inc",'J',
+"Co",'N',
+"Corp",'N',
+"Jan",'N',
+"Feb",'N',
+"Mar",'N',
+"Apr",'N',
+"Jun",'N',
+"Aug",'N',
+"Sept",'N',
+"Oct",'N',
+"Nov",'N',
+"Dec",'N',
+"Sen",'Y',
+"Sens",'Y',
+"Rep",'Y',
+"Hon",'Y',
+"Gov",'Y',
+"Lt",'Y',
+"Col",'Y',
+"Comdr",'Y',
+"Cmdr",'Y',
+"Capt",'Y',
+"Calif",'N',
+"Ky",'N',
+"Va",'N',
+0,0
+};

diff --git a/usr/src/usr.bin/diction/style1/nhash.c b/usr/src/usr.bin/diction/style1/nhash.c
index 361a18b..b0cda54 100644 (file)
--- a/usr/src/usr.bin/diction/style1/nhash.c
+++ b/usr/src/usr.bin/diction/style1/nhash.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)nhash.c    4.2     (Berkeley)      82/11/06";
+static char nhash_sccsid[] = "@(#)nhash.c      4.2     (Berkeley)      82/11/06";

 #endif not lint
 
 struct dict {
 #endif not lint
 
 struct dict {


@@ -9,8 +9,10 @@ struct dict {
 extern struct dict ary_d[], cy_d[], ery_d[], fy_d[],gy_d[];
 extern struct dict ity_d[],ly_d[],ory_d[],ry_d[],ty_d[];
 extern struct dict dict[];
 extern struct dict ary_d[], cy_d[], ery_d[], fy_d[],gy_d[];
 extern struct dict ity_d[],ly_d[],ory_d[],ry_d[],ty_d[];
 extern struct dict dict[];

+extern struct dict abbrev_d[];

 char aahash();
 char lookup();
 char aahash();
 char lookup();

+char abbrev();

 char ary();
 char cy();
 char ery();
 char ary();
 char cy();
 char ery();


@@ -62,7 +64,7 @@ struct dict *data;
                        }
                p1 = (p1+p2)%aatsize;
        }
                        }
                p1 = (p1+p2)%aatsize;
        }

-       fprintf(stderr, "hash table full\n");
+       fprintf(stderr, "hash table full:size %d\n",aatsize);

        exit();
 }
 getd(){
        exit();
 }
 getd(){


@@ -73,11 +75,19 @@ getd(){
                ptr++;
        }
 }
                ptr++;
        }
 }

+getab(){
+       struct dict *ptr;
+       ptr = abbrev_d;
+       while(ptr->entry != 0){
+               abbrev(ptr->entry,0,ptr);
+               ptr++;
+       }
+}

 
 

-struct hnode aa1root[463];
-#define aa1tsize 463
-#define aa1p1 457
-#define aa1p2 461
+struct hnode aa1root[499];
+#define aa1tsize 499
+#define aa1p1 487
+#define aa1p2 491

 char 
 lookup(a0,a1,ptr)
 char *a0;
 char 
 lookup(a0,a1,ptr)
 char *a0;


@@ -225,3 +235,14 @@ ygetd(){
                ptr++;
        }
 }
                ptr++;
        }
 }

+struct hnode aa42root[71];
+#define aa42tsize 71
+#define aa42p1 61
+#define aa42p2 67
+char
+abbrev(a0,a1,ptr)
+       char *a0;
+       struct dict *ptr;
+{
+       return(aahash(a0,a1,aa42tsize,aa42p1,aa42p2,aa42root,ptr));
+}

diff --git a/usr/src/usr.bin/diction/style1/ydict.c b/usr/src/usr.bin/diction/style1/ydict.c
index 6860cbe..d9995a2 100644 (file)
--- a/usr/src/usr.bin/diction/style1/ydict.c
+++ b/usr/src/usr.bin/diction/style1/ydict.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)ydict.c    4.2     (Berkeley)      82/11/06";
+static char ydict_sccsid[] = "@(#)ydict.c      4.2     (Berkeley)      82/11/06";

 #endif not lint
 
 struct dict ary_d[] = {
 #endif not lint
 
 struct dict ary_d[] = {

diff --git a/usr/src/usr.bin/diction/style2/edict.c b/usr/src/usr.bin/diction/style2/edict.c
index d11aac0..a54b872 100644 (file)
--- a/usr/src/usr.bin/diction/style2/edict.c
+++ b/usr/src/usr.bin/diction/style2/edict.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)edict.c    4.2     (Berkeley)      82/11/06";
+static char edict_sccsid[] = "@(#)edict.c      4.2     (Berkeley)      82/11/06";

 #endif not lint
 
 struct dict able_d[] = {
 #endif not lint
 
 struct dict able_d[] = {


@@ -128,6 +128,15 @@ struct dict ance_d[] = {
 "labnu",'V',
 "ksa",'D',
 "hcrep",'D',
 "labnu",'V',
 "ksa",'D',
 "hcrep",'D',

+"veler",'N',           /*added*/
+"tropmi",'N',
+"tsni",'N',
+"cifingisni",'N',
+"tsbus",'N',
+"nimul",'N',
+"cifingis",'N',
+"iravni",'N',
+"velerri",'N',

 0,0
 };
 struct dict ant_d[] = {
 0,0
 };
 struct dict ant_d[] = {


@@ -242,6 +251,20 @@ struct dict ence_d[] = {
 "h",'D',
 "ht",'D',
 "hw",'D',
 "h",'D',
 "ht",'D',
 "hw",'D',

+"lav",'N',             /*added*/
+"uqesnoc",'N',
+"dive",'N',
+"idua",'N',
+"inevnoc",'N',
+"sse",'N',
+"ics",'N',
+"lupo",'N',
+"itap",'N',
+"rehoc",'N',
+"irepxeni",'N',
+"tsixenon",'N',
+"cselosbo",'N',
+"serp",'N',

 0,0
 };
 struct dict ess_d[] = {
 0,0
 };
 struct dict ess_d[] = {


@@ -599,6 +622,33 @@ struct dict ion_d[] = {
 "tidnocer",'V',
 "hsafer",'V',
 "ssim",'U',
 "tidnocer",'V',
 "hsafer",'V',
 "ssim",'U',

+"tamrofni",'N',                /*added*/
+"tacol",'N',
+"tauqe",'N',
+"retirc",'N',
+"ger",'N',
+"srev",'N',
+"tarud",'N',
+"tnevnoc",'N',
+"taroproc",'N',
+"snemid",'N',
+"tcarf",'N',
+"tiutni",'N',
+"taton",'N',
+"ton",'N',
+"tpo",'N',
+"ssap",'N',
+"sses",'N',
+"tisnart",'N',
+"tilaoc",'N',
+"tcnujnoc",'N',
+"tpecxe",'N',
+"tnettani",'N',
+"tceridni",'N',
+"taercer",'N',
+"tatuper",'N',
+"tacitsihpos",'N',
+"tisnart",'N',

 0,0
 };
 struct dict ional_d[] = {
 0,0
 };
 struct dict ional_d[] = {


@@ -1088,6 +1138,14 @@ struct dict ment_d[] = {
 "elcni",'J',
 "ehev",'J',
 "llatsni",'Y',
 "elcni",'J',
 "ehev",'J',
 "llatsni",'Y',

+"norivne",'N',         /*added*/
+"om",'N',
+"irted",'N',
+"ele",'N',
+"nrevog",'N',
+"traped",'N',
+"ercni",'Z',
+"eganam",'N',

 0,0
 };
 struct dict ness_d[] = {
 0,0
 };
 struct dict ness_d[] = {


@@ -1306,12 +1364,13 @@ struct dict ing_d[] = {
 0,0
 };
 struct dict ed_d[] = {
 0,0
 };
 struct dict ed_d[] = {

+"rfla",'Y',    /*added*/

 "elb",'V',
 "bme",'V',
 "ecxe",'V',
 "ecorp",'V',
 "eccus",'V',
 "elb",'V',
 "bme",'V',
 "ecxe",'V',
 "ecorp",'V',
 "eccus",'V',

-"t",'V',
+"t",'Y',

 "w",'V',
 "b",'Z',
 "lsbob",'Z',
 "w",'V',
 "b",'Z',
 "lsbob",'Z',