*** special.c.orig	Mon Aug 14 15:59:23 2000
--- special.c	Mon Aug 14 15:59:23 2000
***************
*** 64,67 ****
--- 64,68 ----
  #include "obj.e"
  #include "page.e"
+ #include "pattern.e"
  #include "poly.e"
  #include "raster.e"
***************
*** 74,77 ****
--- 75,79 ----
  #include "special.e"
  #include "stk.e"
+ #include "stretch.e"
  #include "strtbl.e"
  #include "text.e"
***************
*** 727,730 ****
--- 729,734 ----
           (ChangeConnectionViewInfo*)pravci->pv_userdata);
  
+    if (pccvi == NULL) return FALSE;
+ 
     if (pccvi->change_to_connect_view) {
        ChangeObjFill(pccvi->disconn_view_obj, NONEPAT);
***************
*** 738,741 ****
--- 742,746 ----
        ChangeObjPen(pccvi->disconn_view_obj, pccvi->disconn_pen);
     }
+    return TRUE;
  }
  
*** tangram2.c.orig	Mon Aug 14 15:59:24 2000
--- tangram2.c	Mon Aug 14 15:59:24 2000
***************
*** 63,74 ****
     { "About Tangram-II", NULL, "Information about Tangram-II", NULL,
       CMDID_ABOUT_TANGRAM2 },
-    { "Generate Markov Chain", NULL, "Generate Markov Chain", NULL,
-      CMDID_TANGRAM2_GENERATE_CHAIN },
-    { "Start Simulator", NULL, "Start Simulation", NULL,
-      CMDID_TANGRAM2_START_SIMULATOR },
-    { "Simulation Step", NULL, "Simulation Step", NULL,
-      CMDID_TANGRAM2_SIMULATION_STEP },
-    { "End Simulator", NULL, "End Simulation", NULL,
-      CMDID_TANGRAM2_END_SIMULATOR },
     { NULL, NULL, NULL, NULL, INVALID }
  };
--- 63,66 ----
***************
*** 825,830 ****
   "exec(__GENERATE_CHAIN__.write_global_rewards);"
   "exec(__GENERATE_CHAIN__.write_indep_chains);",
-  "strcpy(command, \"gramatica $(file_name) $(__GENERATE_CHAIN__.basename) $(__GENERATE_CHAIN__.dbglevel) -nomaxcheck > $(__GENERATE_CHAIN__.output)\");",
-  "launch(command);",
   "if(\"$(Mode)\"==\"I\",set_mode_I,NULL);",
   "if(\"$(Mode)\"==\"B\",set_mode_B,NULL);",
--- 817,820 ----
*** text.c.orig	Mon Aug 14 15:59:25 2000
--- text.c	Mon Aug 14 15:59:25 2000
***************
*** 4432,4435 ****
--- 4432,4436 ----
        MiniLinesInfo *minilines=NULL;
        MiniLineInfo *pMiniLine=NULL;
+       int v_space=0;
  
        PushCurFont();
***************
*** 4441,4447 ****
        firstMiniLine = minilines->first;
        lastMiniLine = minilines->last;
        free(minilines);
  
!       for (pMiniLine=minilines->first; pMiniLine != NULL;
              pMiniLine=pMiniLine->next) {
           RecalcMetricsInfo rmi;
--- 4442,4449 ----
        firstMiniLine = minilines->first;
        lastMiniLine = minilines->last;
+       v_space = minilines->v_space;
        free(minilines);
  
!       for (pMiniLine=firstMiniLine; pMiniLine != NULL;
              pMiniLine=pMiniLine->next) {
           RecalcMetricsInfo rmi;
***************
*** 4466,4470 ****
              PopCurFont();
           }
!          baseline_y += pMiniLine->des + minilines->v_space;
           if (pMiniLine->next != NULL) {
              baseline_y += pMiniLine->next->asc;
--- 4468,4472 ----
              PopCurFont();
           }
!          baseline_y += pMiniLine->des + v_space;
           if (pMiniLine->next != NULL) {
              baseline_y += pMiniLine->next->asc;
*** attr.e.orig	Mon Aug 14 15:59:27 2000
--- attr.e	Mon Aug 14 15:59:27 2000
***************
*** 82,85 ****
--- 82,90 ----
  extern int	HasEditAttrsInContextMenu ARGS_DECL((struct ObjRec *,
  		                                     struct AttrRec **));
+ extern void	FreeRestrictedAttrNames ARGS_DECL((char **ppsz_restricted,
+ 		                                   int num_restricted));
+ extern void	GetRestrictedAttrNames ARGS_DECL((struct ObjRec *,
+ 		                                  char ***pppsz_restricted,
+ 		                                  int *pn_num_restricted));
  extern int	IsRestrictedAttr ARGS_DECL((char *attr_name,
  		                            char **ppsz_restricted,
*** patchlvl.h.orig	Mon Aug 14 15:59:27 2000
--- patchlvl.h	Mon Aug 14 15:59:27 2000
***************
*** 35,39 ****
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 36
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
--- 35,39 ----
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 37
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
*** Imakefile.orig	Mon Aug 14 15:59:28 2000
--- Imakefile	Mon Aug 14 15:59:28 2000
***************
*** 54,58 ****
                    $(MOREDEFINES)
  
! TGIFVERSION	= 4.1.36
  
  XCOMM Things to try to add to the DEFINES line above:
--- 54,58 ----
                    $(MOREDEFINES)
  
! TGIFVERSION	= 4.1.37
  
  XCOMM Things to try to add to the DEFINES line above:
*** HISTORY.orig	Mon Aug 14 15:59:29 2000
--- HISTORY	Mon Aug 14 15:59:29 2000
***************
*** 1,2 ****
--- 1,6 ----
+ -----------------------> tgif-4.1.36 => tgif-4.1.37 <-----------------------
+ 1)  Fix a bug that may cause seg faults when reading tgif files.  Thanks to
+     Hiroei IMAI <imai@nisoc.or.jp> for the patch.
+ 
  -----------------------> tgif-4.1.35 => tgif-4.1.36 <-----------------------
  1)  Fix a bug in Latest Release Info under the Help Menu.  Thanks to
*** make.comdep.orig	Mon Aug 14 15:59:30 2000
--- make.comdep	Mon Aug 14 15:59:30 2000
***************
*** 378,384 ****
  		dialog.e drawing.e dup.e edit.e exec.e file.e grid.e group.e \
  		mainloop.e mainmenu.e mark.e menu.e menuinfo.e miniline.e \
! 		msg.e move.e names.e obj.e page.e poly.e raster.e rect.e \
! 		remote.e ruler.e scroll.e select.e setup.e special.e stk.e \
! 		strtbl.e text.e util.e version.e 
  spline$(O) :	tgifdefs.h const.h tgif_dbg.h types.h dialog.e msg.e poly.e \
  		polygon.e ps.e raster.e rect.e setup.e spline.e strtbl.e 
--- 378,384 ----
  		dialog.e drawing.e dup.e edit.e exec.e file.e grid.e group.e \
  		mainloop.e mainmenu.e mark.e menu.e menuinfo.e miniline.e \
! 		msg.e move.e names.e obj.e page.e pattern.e poly.e raster.e \
! 		rect.e remote.e ruler.e scroll.e select.e setup.e special.e \
! 		stk.e stretch.e strtbl.e text.e util.e version.e 
  spline$(O) :	tgifdefs.h const.h tgif_dbg.h types.h dialog.e msg.e poly.e \
  		polygon.e ps.e raster.e rect.e setup.e spline.e strtbl.e