In $RBGB:
cvs diff -bitw . >bde.cvsdiff051129
Index: dprint.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/dprint.h,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 dprint.h
66d65
< //#define EP #ifdef DPDBUG CEP  #endif -  fails to insert \n or \\ before #endif
Index: prep.csh
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/prep.csh,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 prep.csh
33c33
< alias G 'gdb -x cmd.041024 ../pr_util_nolog/$HOSTTYPE/bin/bde.exe'
---
> alias G 'gdb ../pr_util_nolog/$HOSTTYPE/bin/bde.exe'
Index: include/graph.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/include/graph.h,v
retrieving revision 1.14
diff -b -i -t -w -r1.14 graph.h
517c517
<         hlink(struct HL *passHL);
---
>         hlink(struct HL *passHL);       // c'tor
583d582
< 
664a664,666
> 
>         void PrintGraphObjectList(void); //RJL051127 for debug
> 
699c701
< 
---
>         void doPrint(); // debug aid - added 051126 - RJL
Index: pr_util_log/94sbde_schema.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/94sbde_schema.h,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 94sbde_schema.h
27c27
< #define CHGEN_QUALIFIERS " -log"
---
> #define CHGEN_QUALIFIERS " -log -metafile"
Index: pr_util_log/pr_log.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/pr_log.c,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 pr_log.c
15c15
< /* Log added 041129 - RJL  */
---
> /* Log aded 041129 - RJL  */
39a40
> /*   strcpy();*/
403c404
< #ifdef GENLOG
---
> 
418d418
< #endif
421c421,422
< #ifdef GENLOG
---
> 
> //#ifdef GENLOG
445c446
<             LP;return;
---
>             return;
451c452
< #endif
---
> //#endif
469c470
< {//EP; << caused pr_log.c:471: parse error before `char' - RJL050909
---
> {
475c476,477
< EP;//moved here from '{EP;' - RJL050909
---
> 
> EP;
481c483
<                 LP;return (-1);
---
>                 return (-1);
489c491
<                 LP;return (-2);
---
>                 return (-2);
503c505
<                 LP;return (-4);
---
>                 return (-4);
526c528
<                 LP;return (-3);
---
>                 return (-3);
548,549c550,551
<         LP;return (0);
< LP;}    /* End pr_startlog      */
---
>         return (0);
> }       /* End pr_startlog      */
1545c1547
< /* #if 0 at line 1591 to EOF */ 
---
> /* #if 0 at line 1559 to EOF */
2140,2141c2142,2143
< #ifdef GENLOG
< int pr_replay(char *view, char* logfile,
---
> 
> int pr_replay(char *view, char logfile[NAMELENGTH],
2144c2146
< 
---
>   /*unused: FILE *log_fp;*/
2210c2212
< //#ifdef GENLOG
---
> #ifdef GENLOG
2212c2214
< //#endif
---
> #endif
2234c2236
< #endif
---
> 
Index: pr_util_nolog/94sbde_schema.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/94sbde_schema.h,v
retrieving revision 1.2
diff -b -i -t -w -r1.2 94sbde_schema.h
6c6
< /*****************************************************************/
---
> /***************************************************************/
27c27
< #define CHGEN_QUALIFIERS ""
---
> #define CHGEN_QUALIFIERS " -metafile"
273,275c273,275
< /***********************************************/
< /* This structure is used to simplify type casting pointers within table */
< /* rows.                                                                 */
---
> /*line 273:**********************************************/
> /* This structure is used to simplify type casting pointers within table rows. */
> /*(I think it should be type hcg_key = unsigned int-RJL051126 ) */
Index: pr_util_nolog/Imakefile
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/Imakefile,v
retrieving revision 1.4
diff -b -i -t -w -r1.4 Imakefile
1,75c1,76
< /*******************************************************************
<  * $Log: Imakefile,v $
<  * Revision 1.4  2005/10/25 18:20:02  lechner
<  * Added copysources: dependencies from these files:
<  * $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h
<  * (This didn't prevent recompiling all pr_*.c file s. - still TBD)
<  * Added a command $(CP) 94sbde_schema.h from $PRDIR to $PROBJDIR.
<  *
<  * Revision 1.3  2005/10/23 08:50:31  lechner
<  * Added EXT=; in one case. Appended '@@\' to a blank line inside a macro.
<  * Added dependencies to the target copysources:
<  * copysources: $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h
<  *
<  * Revision 1.2  2005/08/22 16:11:55  lechner
<  * Fixed a minor typo.
<  *
<  * Revision 1.1  2005/08/12 03:11:57  lechner
<  * Major revision of Imakefiles used by xmkmf -a [-DLOG], to support
<  * a more elaborate  bde build tree for two $HOSTTYPES and optional
<  * change-log creation and replay capability.
<  *
<  * Separate  Makefiles are generated in src, pr_util_log and pr_util_nolog
<  * by three Imakefiles in bde, src and these subdirectories.
<  * Chgen [-log] should regenerate pr_util_nolog [pr_util_log]content.
<  * Separate obj .o and executable .exe files can now be maintained
<  * on $HOSTTYPEs i386-linux and alpha.
<  *
<  * (Caveat: Executing xmkmf -a [-DLOG] should  produce Makefiles
<  * that work in subtree pr_util_nolog [pr_util_log], but currently
<  * they both update pr_util_nolog/$HOSTTYPE/obj from bde/src. -RJL050811)
<  *
<  * The directory tree for builds under bde is now:
<  * {src, {pr_util_nolog, pr_util_log}/$HOSTTYPE/{probj, obj, bin}}
<  * Imake assumes that this tree exists (TBD: check out empty from CVS).
<  * Defined CXXLINK to link with g++ or cxx and replace link[no]log.csh
<  *
<  * Revision 1.16  2005/07/31 03:21:44  lechner
<  * Corrected spelling of CHGEN symbol definition.
<  *
<  ***********************************************************
<  * This Imakefile is for bde/pr_util_nolog. - RJL050805
<  * It updates files in bde/{pr_util_nolog/{,$(HOSTTYPE)/{obj,bin}}
<  * See -r 1.16 of bde/pr_util/Imakefile for earlier revs.
<  *
<  *******************************************************************
<  * subst -Wall for -w - RJL 2k0712
<  * add pr_stats.c, pr_stats.o - RJL 2k0718
<  * In bde/configure,h, #define BDELOG to generate and use pr_log.c
<  * or #define BDEREPLAY to replay from logdata.txt.
<  * This now adds GENLOG instead of BDELOG to GENDFINES -RJL 020401
<  *
<  * Add this to GenerateLibFromSchema' to run chgen
<  * and create pr_*.c, *schema.h:
<  * $(GENSRCS): schemafile
<  *      $(CHGEN) $(GENFLAGS) schemafile
<  *
<  ************************************************************
<  * configure.h #defines GENVxx, GENLOG, and
<  * optional BDELOG (or BDEREPLAY, and BDEONEOF)
<  * To resolve a double-maintenance problem,
<  * GENVERSION is assigned in bde/Imakefile
<  * and substituted into -D$(GENVERSION)
<  * (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime)
<  *
<  * bde/Imakefile #includes configure.h which has optional -DGENLOG
<  * This adds GENLOG and (app-specific) -DBDELOG to BDEDEFINES
<  * Both BDELOG and BDEREPLAY need pr_log.c:
<  * WARNING: dprint.h updates do not cause dprint.c recompilation!??-RJL041129
<  *
<  * I added (and checked-in) lut.c to GENSRCS, lut.h to GENOBJS. - RJL050721
<  * (copied from $CASE/gen/ver_13/chgen/src/pr_util)             - RJL050721
<  * GENLOG changes conditional code in pr_*.c and adds new file pr_log.c:
<  * Moved all comments to top - RJL050807
<  */
< /* xmkmf -a --> imake includes -Dlinux: - what about make's env'mt? */
---
> # /*******************************************************************
> # ** $Log: Imakefile,v $
> # ** Revision 1.4  2005/10/25 18:20:02  lechner
> # ** Added copysources: dependencies from these files:
> # ** $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h
> # ** (This didn't prevent recompiling all pr_*.c file s. - still TBD)
> # ** Added a command $(CP) 94sbde_schema.h from $PRDIR to $PROBJDIR.
> # **
> # ** Revision 1.3  2005/10/23 08:50:31  lechner
> # ** Added EXT=; in one case. Appended '@@\' to a blank line inside a macro.
> # ** Added dependencies to the target copysources:
> # ** copysources: $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h
> # **
> # ** Revision 1.2  2005/08/22 16:11:55  lechner
> # ** Fixed a minor typo.
> # **
> # ** Revision 1.1  2005/08/12 03:11:57  lechner
> # ** Major revision of Imakefiles used by xmkmf -a [-DLOG], to support
> # ** a more elaborate  bde build tree for two $HOSTTYPES and optional
> # ** change-log creation and replay capability.
> # **
> # ** Separate  Makefiles are generated in src, pr_util_log and pr_util_nolog
> # ** by three Imakefiles in bde, src and these subdirectories.
> # ** Chgen [-log] should regenerate pr_util_nolog [pr_util_log]content.
> # ** Separate obj .o and executable .exe files can now be maintained
> # ** on $HOSTTYPEs i386-linux and alpha.
> # **
> # ** (Caveat: Executing xmkmf -a [-DLOG] should  produce Makefiles
> # ** that work in subtree pr_util_nolog [pr_util_log], but currently
> # ** they both update pr_util_nolog/$HOSTTYPE/obj from bde/src. -RJL050811)
> # **
> # ** The directory tree for builds under bde is now:
> # ** {src, {pr_util_nolog, pr_util_log}/$HOSTTYPE/{probj, obj, bin}}
> # ** Imake assumes that this tree exists (TBD: check out empty from CVS).
> # ** Defined CXXLINK to link with g++ or cxx and replace link[no]log.csh
> # **
> # ** Revision 1.16  2005/07/31 03:21:44  lechner
> # ** Corrected spelling of CHGEN symbol definition.
> # **
> # ************************************************************
> # ** This Imakefile is for bde/pr_util_nolog. - RJL050805
> # ** It updates files in bde/{pr_util_nolog/{,$(HOSTTYPE)/{obj,bin}}
> # ** See -r 1.16 of bde/pr_util/Imakefile for earlier revs.
> # **
> # ********************************************************************
> # ** subst -Wall for -w - RJL 2k0712
> # ** add pr_stats.c, pr_stats.o - RJL 2k0718
> # ** In bde/configure,h, #define BDELOG to generate and use pr_log.c
> # ** or #define BDEREPLAY to replay from logdata.txt.
> # ** This now adds GENLOG instead of BDELOG to GENDFINES -RJL 020401
> # **
> # ** Add this to GenerateLibFromSchema' to run chgen
> # ** and create pr_*.c, *schema.h:
> # ** $(GENSRCS): schemafile
> # **      $(CHGEN) $(GENFLAGS) schemafile
> # **
> # *************************************************************
> # ** configure.h #defines GENVxx, GENLOG, and
> # ** optional BDELOG (or BDEREPLAY, and BDEONEOF)
> # ** To resolve a double-maintenance problem,
> # ** GENVERSION is assigned in bde/Imakefile
> # ** and substituted into -D$(GENVERSION)
> # ** (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime)
> # **
> # ** bde/Imakefile #includes configure.h which has optional -DGENLOG
> # ** This adds GENLOG and (app-specific) -DBDELOG to BDEDEFINES
> # ** Both BDELOG and BDEREPLAY need pr_log.c:
> # ** WARNING: dprint.h updates do not cause dprint.c recompilation!??-RJL041129
> # **
> # ** I added (and checked-in) lut.c to GENSRCS, lut.h to GENOBJS. - RJL050721
> # ** (copied from $CASE/gen/ver_13/chgen/src/pr_util)             - RJL050721
> # ** GENLOG changes conditional code in pr_*.c and adds new file pr_log.c:
> # ** Moved all comments to top - RJL050807
> # */
> #/* xmkmf -a --> imake includes -Dlinux: - what about make's env'mt? */
> #/* -D LinuxArchitecture  is present in bde/src/Makefile on Mercury. */
Index: pr_util_nolog/pr_load.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/pr_load.c,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 pr_load.c
37c37
< /* includes dprint.h */
---
> /* includes dprint.h but not lut.h */
43a44
> extern int lut_init(lut_st, lut_type);/*in lut.c, not lut.h-RJL051127*/
737d737
< 
738a739
> 
766a768
> EP;
772c774,775
<     lut_init(&hcg_table_abbrev_lut, ABBR_TBL_TYPE);
---
> /*in lut.c, bbr_lut_create calls lut_init(p_lut, ABBR_TBL_TYPE); -RJL051127 */
> /*so I removed this call:   lut_init(&hcg_table_abbrev_lut, ABBR_TBL_TYPE);*/
1061c1064
< }/* end pr_init (1592:1922)*/
---
> LP;}/* end pr_init (1592:1922)*/
1239c1242,1243
<         (struct pa *) ca##curr->p##_fpp = pa##curr2; \
---
>         /*(struct pa *) ca##curr->p##_fpp = pa##curr2;*/ \
>         ca##curr->p##_fpp = (struct dummy_type*) pa##curr2; \
1244,1245c1248,1251
<                 for (ca##temp2 = pa##curr2->c##_fcp; (struct pa *) ca##temp2->p##_fpp != pa##curr2; ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \
<                 (struct ca *) ca##temp2->p##_fpp = ca##curr; \
---
>         for (ca##temp2 = pa##curr2->c##_fcp; \
>                 (struct pa*) ca##temp2->p##_fpp != pa##curr2; \
>                 ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \
>             /*(struct ca *)*/ ca##temp2->p##_fpp = (struct dummy_type*) ca##curr; \
1418c1424,1425
< 
---
>         char* ttabbrev; /* added 051127 - wouldn't permit decl in asgnmt. */
> EP;
1445a1453,1458
>         /*tbl_encoding=encoding( hcg_table_seq_list[hcg_tbl_idx].ttabbrev);*/
>         ttabbrev =  hcg_table_seq_list[hcg_tbl_idx].ttabbrev;
>         DP; tbl_encoding = encoding(ttabbrev);
>         dprintds("tbl_encoding=%d,ttabbrev=\n", tbl_encoding, ttabbrev);
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
>         TTPRNT;
1447d1459
<         tbl_encoding = encoding( hcg_table_seq_list[hcg_tbl_idx].ttabbrev );    
1449c1461,1463
<         {
---
>         {// TBD: make these class methods when gencpp makes XX a class:
>          // E.g.: call class method FO::do_add(ifldvalist) for case#0.
>          // But pr_create must call a c'tor first, without a pkey???
1613,1614c1627
<              dprint("TBD: Load checkpoint *DB1 then replay logfile.
< ");
---
>              dprint("TBD: Load checkpoint *DB1 then replay logfile.\n");//was bug - RA051126
1724c1737,1738
< 
---
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
> TTPRNT;
Index: src/bendptops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/bendptops.cc,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 bendptops.cc
265a266
>     Ggroup* topobject;
Index: src/buttonevent.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/buttonevent.cc,v
retrieving revision 1.10
diff -b -i -t -w -r1.10 buttonevent.cc
148c148
< 
---
> // functions inside:i dobuttonevent 
179c179
< {
---
> {EP;
185c185
< 
---
> // TBD: check XtPointer asgnmt to int c below.
198d197
<     
202c201,202
<       {
---
>     {   dprintdd("State=%x:buttonevent=%d; ",selected.getstate(),event->type); 
>         dprintdd("at mouse position x=%d, y=%d\n", event->x, event->y); 
437c437
<      //WHY display this in ALL cases? - RJL)40918
---
>      //WHY display this in ALL cases? - RJL040918
441c441
< }  // end dobuttonevent
---
> LP;}  // end dobuttonevent
Index: src/captionops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/captionops.cc,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 captionops.cc
195c195
< 
---
> extern Ggroup* topobject; // for caption_create and caption_resize
258d257
<     
Index: src/fileio.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/fileio.cc,v
retrieving revision 1.30
diff -b -i -t -w -r1.30 fileio.cc
1d0
< // This version  75866 Apr 11 00:11 fileio.cc; 4/23 local version lost - RJL 
712a712,715
> // macro to print ttabbrev list in encoded order:
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
> 
> 
1105c1108
<   //hcg_key parentHGid; // added 2k0902; not used > 050725  - RJL
---
> 
1150,1151c1153,1154
<   pr_set_str(HG_elt, FSid, "FS010000");
<   pr_set_str(HG_elt, HNid, "HN010000");
---
>   pr_set_str(HG_elt, FSid, "FS010000"); // not used; is_key = 0
>   pr_set_str(HG_elt, HNid, "HN010000"); // not used; is_key = 0
1156c1159
<   //GetUserName calls getlogin which LP;returned NULL on Linux-RJL041012
---
>   //GetUserName calls getlogin which returned NULL on Linux-RJL041012
1164c1167
<   // BUG:(HG_elt->HGid == 0): pr_add FAILS - RJL050727
---
> 
1176c1179
<   pr_set_flt( CG_elt, CGwidth, d_gcheight ) ;
---
>   pr_set_flt( CG_elt, CGheight, 20 /*d_gcheight*/ ) ;//was CGwidth - RJL051127
1192c1195
<                                 //                      Javier/Kathy/Lon
---
>                                 // Why is (default?) height == 0? 
1197c1200
<   // a CG COULD hold GX-lines with content: author date version etc. as well as title)
---
>   // CG COULD hold GX-line content: author date version etc. as well as title
1205c1208
< void CreateInitialGraphCaption( char *title )
---
> void CreateInitialGraphCaption( char *title )  //creates GX child of CGcurr
1208c1211
< {
---
> {EP;
1227c1230
<      tempid = "DA010009";
---
>      tempid = "DA000000";//100009 -> 000000 - RJL051127
1229c1232
<      pr_set_key( GX_elt, CGid, CGcurr->CGid); 
---
>      pr_set_key( GX_elt, CGid, CGcurr->CGid); // OK - pr_add will be called 
1242c1245
< 
---
>     // pr_add is necessary after pr_set_key above.
1332c1335,1337
< /* moved from bdeReplay to fileio.cc 
---
> /* NOTE: creates List of node, hlink, caption class objects for cHG 
>  * to be drawn by topobject->Draw; LIFO List begins at topobject->subobjects.
>  * Moved from bdeReplay to fileio.cc 
1335c1340
<  * of new HN/outgoing-HL/CG  struct ptrs
---
>  * of new HN+outgoing-HL+CG  struct ptrs
1339a1345,1346
>  * Clients:  RealDisplayGraph(), Replay_LoadGraph() in fileio.cc
>  * with arg = HGcurr or HG (or cHG?)
1342a1350
>     TTPRNT;     // verifies last item is first CG?
1449c1457
<   char* hg_string_ptr = hg_string;      // char* ---> & - RJL 0400609
---
>   char* hg_string_ptr = hg_string;      // char* ---> & - RJL 040609
1487c1495
<         updatedisplaylist(HGcurr);      // in bdeReplay.cc - RJL 020501
---
>         updatedisplaylist(HGcurr);      // in fileio.cc (was in bdeReplay.cc)
2394c2402
<         LP;return error_msg[2];
---
>         LP;return error_msg[2]; // line 2394
2399c2407
<   LP;return(0);
---
>   LP;return((char*)NULL); // was return 0 - RJL051113
Index: src/graphobject.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/graphobject.cc,v
retrieving revision 1.21
diff -b -i -t -w -r1.21 graphobject.cc
355d354
< #include "prototype.h"  //includes bde20.h with typedef enum WhichBpt
356a356
> #include "prototype.h"  //includes bde20.h with typedef enum WhichBpt
368a369
> 
370a372,376
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
> 
> //EP and LP: graphobject.cc:1211: `printf' cannot be used as a function -051128
> 
> 
398a405
> 
399a407
> 
405c413
< extern void updatedisplaylist(struct HG *cHG);//whereisit?
---
> extern void updatedisplaylist(struct HG *cHG);//in fileio.cc
416c424,427
< // Prepend new object to existing (backward) List of subobjects.
---
> // Prepend 'this' to existing (backward) List object->subobjects.
> // TBCHecked: initial List object is the graph with id=HGid?
> // To verify this?: traverse list until next=NULL and assert id = HGcurr->id
> 
423a435
>       object->subobjects->PrintGraphObjectList();
426a439,456
> /**************************************************/
> void List::PrintGraphObjectList(void)   //RJL051128 - for debug use
> {
> #ifdef DEBUG
>         List* temp; 
>         EP;
>         temp = this;  //topobject->subobjects;
>         printf(" ListGraphobjId:\n ");  
>         while (temp!= 0) 
>         {
>                 printf(" %lux,", temp->object->getid() ); 
>                 temp=temp->next;
>         }; 
>         printf ("\nEnd of List;\n");
>         LP;
> #endif
> } // end PrintGraphObjectList
> 
453c483
<  * Assigns the object instance id  'this' to the global 'currentselection'.
---
>  * Assigns the object instance ref. 'this' to the global 'currentselection'.
505c535
<               if ((obj = current->object->findbyindex(id)) 
---
>               if ((obj = current->object->findbyindex(id)) // <-- recursion!
537c567
<     delete next;        //Is NULL ptr OK here? - RJL 040517
---
>     delete next; // delete List tail? Is NULL ptr OK here? - RJL 040517
549a580,581
>  * RJL 051126: That would be nasty - violates encapsulation
>  *      But notification (View to Model) is appropriate.
626c658
< //WHy isn't this argument GENV6/8 dependent? - RJL
---
> 
633c665
< 
---
> /* for XB text block only - RJL */
783,784c815,816
<     assert (topobject != NULL);
<     current = topobject->subobjects;
---
>     assert (topobject != NULL);  // can we assert (hasType(id=getid(), HG));???
>     current = topobject->subobjects;    // most recent object (prepended to List)
809,810c841
< {   //pre-condition: (topobject != NULL, first object type = HG)
< #ifdef DEBUG
---
> {   //pre-condition: (topobject != NULL, first object type = HG - NOGOOD!)
813c844
<     hcg_key id, HGpk;//schema.h:166:typedef unsigned long hcg_key;
---
>     //hcg_key id, HGpk;//schema.h:166:typedef unsigned long hcg_key;
815c846
<     struct HG* HGptr;
---
>     //struct HG* HGptr;
820a852
> 
823,826c855,858
<     HGpk = (hcg_key)(current->object->getid());
<     assert(hasType(HGpk, HG));
<     dprintd("First object pkey is %ux\n",  HGptr->HGid);
<     HGptr  = (struct HG*) current->object->getcurr();
---
>     current->PrintGraphObjectList();
>     //HGpk = (hcg_key)(current->object->getid());
> 
>     //HGptr  = (struct HG*) current->object->getcurr();
827a860
>         hcg_key id;
834c867
<         printf("hasType(id, HN, HL, CG) = %d, %d, %d\n", 
---
>         printf("hasType id = %lux =? HN, HL, CG) is  %d, %d, %d\n", id,
845d877
< #endif
996,998c1028,1037
<  * I.e. if chgen or gencpp declared object List element as a superclass LE 
<  * of HN, HL, CG, then HNid in the object could be replaced by LEid and LEid_pp 
<  * in HN, HL, CG, and LE would contain a 'dummyptr' HNid_fcp, HGid_fcp OR HLid_fcp.
---
>  * I.e. if chgen or gencpp declared table ListElement as a superclass LE 
>  * of HN, HL, CG, then HNid in the object could be replaced by LEid 
>  * (and LEid_pp) in HN, HL, CG;  also, LE would contain a subclass ref.
>  * which is the union (struct dummy_type*) of {HNid_fcp OR HGid_fcp OR HLid_fcp}.
>  * 
>  * Alternatively (and preferably) each HN, HL or CG would delegate to a
>  * singleton child-set of one LE-row; LE woUld then contain one of 
>  * HNid_fcp OR HGid_fcp OR HLid_fcp, and its corresponding parent fkey
>  * HNid, CGid or HLid. The parent HN, CG or HL will NOT need a schema change.
>  * pr_add from chgen13 will maintain LEid_fcp in each HN, CG and HL .
1004a1044
>   doPrint();// Ggroup:: emit HN,HL,CG components of current HG.
1034,1045c1074
< #if 0
< ---------------- Code from select_CG and _HL:
<   DP; printf("current = %px, cs = %px, id = %x\n",
<                 current,cs,(unsigned int)id);
<   assert(current==NULL||hasType(id,HN));
<   if(current != NULL)
<         ((graphobject *)current->object)->selectObject();
<         // Effects: currentselection = this, selected=1, highlight(1):
<   else
<         cs= NULL; // and return 0 since current == NULL
< ------------------
< #endif
---
> 
1311,1312c1340,1341
< //  (void) new node(HNcurr); // construct the Ggroup object referencing HNcurr.
<    (void) new node(HN_elt); // construct the Ggroup object referencing HN_elt.
---
>     (void) new node(HN_elt); // construct the graphobject referencing HN_elt.
>     topobject->subobjects->PrintGraphObjectList();
1327c1356
< {EP;   //graphobject.cc lines 1122-1265; - RJL040903 
---
> {   //graphobject.cc lines 1122-1265; - RJL040903 
1336c1365
<     hcg_key HNid1, HNid2; 
---
>     hcg_key HNid1, HNid2; //:1354
1349c1378
< 
---
> EP;//1367
1456,1457c1485,1486
< //    updatedisplaylist(HGcurr); //added - RJL040907 
< // Removed - RJL051114 - BendPts are retrieved from database not display list.
---
> //  updatedisplaylist(HGcurr); //added - RJL040907, Removed - RJL051114:
> //  BendPts are retrieved from database not display list.
1459c1488,1489
< LP;}  // end Ggroup::addlink :1387 (nolog)
---
>     topobject->subobjects->PrintGraphObjectList();
> LP;}  // end Ggroup::addlink:1473 (nolog)
1602a1633
>     
1604c1635
<     // topobject is global = root of List* subobjects
---
>     // topobject is global ptr to / root of List* subobjects
1614a1646,1648
>     currentlp->PrintGraphObjectList();
>     TTPRNT;
> 
1625c1659
<         fprintf(graphdump_fp, 
---
>         fprintf(graphdump_fp, //RJL 051126: This fails - reports pkey FO00000* (3 gtimes):
1627a1662,1670
> #if 0 
> Inside doDump at graphobject.cc:1631
> tblabbr = FO
> doDraw: while currentlp: objcount = 3
> Ggroup::doDraw: ob->Draw on (hcg_key)*pkey=0
> Ggroup::doDraw: ob->Draw on (hcg_key)*pkey=0
> doDump default case: ignore tblidx = 0
> Exit doDump at graphobject.cc:1668
> #endif
1646a1690
> 
1647a1692
> 
1668c1713
< LP;}  // end doDump
---
> EP;}  // end doDump
Index: src/init.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/init.cc,v
retrieving revision 1.13
diff -b -i -t -w -r1.13 init.cc
491c491
< // called from main in bde.cc
---
> // lines 492-868 -  called from main in bde.cc
868c868
< }  // end init()
---
> }  // end init() :492-868
Index: src/nodeops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/nodeops.cc,v
retrieving revision 1.15
diff -b -i -t -w -r1.15 nodeops.cc
681a682
>                                 CAS(SResize); // no change; (Moved inside-RJL051213)
689c690
<                             CAS(SResize); // no change
---
>                             // CAS(SResize); (moved into else/if - N/A to else else)
726c727
<                         //Same state; wait for BUTTON_MOVED or BUTTON_UP;
---
>                         //Same state; wait for BUTTON_MOVED or BUTTON_UP; and confirm
747c748
< //No more wevents in this statet; go to SRN1 next (below):
---
> //No more wevents in this state; go to SRN1 next (below):
790,791c791,793
<                                 center_x, center_y, id, 0); //0=>!first_time; from SRNBDA4
<                         CAS(SResize_node1);
---
>                                 center_x, center_y, id, 0); //1=>first_time; from SRNBDA4
>                         selected.changeAttribState(SResize_node2);// new, bugfix - RJL051113 
>                         //CAS(SResize_node1); // self-transition: handle each incremental move
795c797
<                         // This only happens if click on node without mouse motion.
---
>                         // This only happens if click on node without mouse motion: No Resize!
798c800
<                         ReDraw();               // added 050212
---
>                         ReDraw();               // added 050212 (Why here, if no resize?
824a827
>                         CAS(SResize_node2);
831,832c834
<                         //reenter state SResize_node for THIS node 
<                         DP;selected.changeAttribState(SResize_node); //reconfirm 
---
>                         //reenter state SResize_node: can reconfirm and move node again 
833a836
>                         DP;selected.changeAttribState(SResize_node); 
Index: src/smselect.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/smselect.cc,v
retrieving revision 1.10
diff -b -i -t -w -r1.10 smselect.cc
649c649
< /*  State Log.                                                             */
---
> /*  State Log.  Update 0511112: No longer an error: CAS doesw self-transition */ 
661,662c661,664
<                                         fprintf(stderr,
<     "State Error:  changeAttribState() used to change to primary state\n");
---
> /*RJL 051112: Not an error: CAS implements a self-transition for logging purposes 
>  *                                       fprintf(stderr,
>  *   "State Error:  changeAttribState() used to change to primary state\n");
>  */
666,667d667
< 
< 
Index: src/textops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/textops.cc,v
retrieving revision 1.15
diff -b -i -t -w -r1.15 textops.cc
1220c1220
<         // see analogous event->type map to eventname[type] in eventtypelist.h
---
>         // see analogous event->type map to eventname[type] in eventNameList.h
Index: test/hi.dat
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/test/hi.dat,v
retrieving revision 1.1.1.1
diff -b -i -t -w -r1.1.1.1 hi.dat
1,19d0
<  HG000001 FS010000 HN010000 JACOSTA      23DEC94/1354 23DEC94/1354 test                                                        
<  HN000001 HG000001 FS010000 C 289.0000 272.0000 100.0000 100.0000 Fixed                                                0.0000   0.0000        0        0                     
<  HN000002 HG000001 FS010000 C 597.0000 319.0000 100.0000 100.0000 Fixed                                                0.0000   0.0000        0        0                     
<  HL000001 HN000001 HN000002        2       -1
<  HL000002 CG000004 CG000003        2       -1
<  HP000001 HL000001   0.1586   0.0242        1 0   
<  HP000002 HL000001   0.8299   0.1266        1 1   
<  HP000003 HL000002  -0.4955  -0.5304        1 0   
<  HP000004 HL000002  -0.4968  -0.5304        1 1   
<  CG000001 HG000001 370.0000  25.0000  50.0000  24.0000
<  CG000002 HG000001 536.0000 481.0000 100.0000  50.0000
<  CG000003 HG000001 183.0000 405.0000 100.0000  50.0000
<  CG000004 HG000001 133.0000 142.0000 148.0000 152.0000
<  CG000005 HG000001 576.0000 137.0000 100.0000  50.0000
<  GX000001 CG000001 DA010009   0.0000 Fixed                                                1.0000  -4.0000       30       13 test                                                                                                                            
<  GX000002 CG000004 DA010009   0.0000 Fixed                                               60.0000 -17.0000      227       13 hjdshjksdhjksdahjk  hjdsakhjkdsahjaskd                                                                                          
<  GX000003 CG000004 DA010009   0.0000 Fixed                                               62.0000 -30.0000      179       13 jsdkajdsakjskd ahdsjahjsdahjsd                                                                                                  
<  GX000004 CG000004 DA010009   0.0000 Fixed                                               61.0000 -43.0000       83       13 jkdsjkdsfjkfds                                                                                                                  
<  GX000005 CG000003 DA010009   0.0000 *courier-bold-r*18*                                 40.0000  -2.0000       43       18 hhhh