*** drawing.c.orig	2009-10-08 10:49:03.000000000 -0700
--- drawing.c	2009-10-08 10:27:48.000000000 -0700
***************
*** 16,20 ****
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/drawing.c,v 1.54 2009/08/04 04:39:24 cvsps Exp $
   */
  
--- 16,20 ----
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/drawing.c,v 1.55 2009/10/07 15:52:59 william Exp $
   */
  
***************
*** 2936,2941 ****
     }
     if (valid_shortcut) {
        Msg("");
!       return DoShortCut(key_ev, name, key_sym, key_ev->state, args);
     }
     return INVALID;
--- 2936,2953 ----
     }
     if (valid_shortcut) {
+       int rc=0;
+       int try_x_lookup_keysym=FALSE;
+ 
        Msg("");
! #ifndef _NO_XLOOKUPKEYSYM
!       try_x_lookup_keysym = TRUE;
! #endif /* ~_NO_XLOOKUPKEYSYM */
!       rc = DoShortCut(key_ev, name, key_sym, key_ev->state, args);
!       if (rc == INVALID && try_x_lookup_keysym) {
!          key_sym = XLookupKeysym(key_ev, 0);
! 
!          return DoShortCut(key_ev, name, key_sym, key_ev->state, args);
!       }
!       return rc;
     }
     return INVALID;
*** spline.c.orig	2009-10-08 10:49:03.000000000 -0700
--- spline.c	2009-10-08 10:27:50.000000000 -0700
***************
*** 16,20 ****
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/spline.c,v 1.42 2009/09/15 21:47:46 william Exp $
   */
  
--- 16,20 ----
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/spline.c,v 1.44 2009/10/08 17:25:21 william Exp $
   */
  
***************
*** 940,945 ****
  
  static
! XPoint *MakeDoubleSplinePolygonVertex(Curved, N, XOff, YOff, NumVs, Vs)
!    int Curved, *N, XOff, YOff, NumVs;
     DoublePoint *Vs;
  {
--- 940,945 ----
  
  static
! XPoint *DoMakeDoubleIntSplinePolygonVertex(N, XOff, YOff, NumVs, Vs)
!    int *N, XOff, YOff, NumVs;
     DoublePoint *Vs;
  {
***************
*** 1621,1625 ****
     DoublePoint **CntrlVs, *Vs;
  {
!    int x_off, y_off;
  
     x_off = (zoomedIn ? XOff : (XOff>>zoomScale)<<zoomScale);
--- 1621,1627 ----
     DoublePoint **CntrlVs, *Vs;
  {
!    int x_off=0, y_off=0;
!    int saved_tighter_splines=tighterStructSplines;
!    XPoint *pxp=NULL;
  
     x_off = (zoomedIn ? XOff : (XOff>>zoomScale)<<zoomScale);
***************
*** 1655,1660 ****
     *CntrlVs = DoubleClosedControlPts(NumVs, CntrlN);
  
!    return MakeDoubleSplinePolygonVertex(LT_INTSPLINE, N, XOff, YOff, *CntrlN,
!          *CntrlVs);
  }
  
--- 1657,1667 ----
     *CntrlVs = DoubleClosedControlPts(NumVs, CntrlN);
  
!    if (saved_tighter_splines) {
!       tighterStructSplines = FALSE;
!    }
!    pxp = DoMakeDoubleIntSplinePolygonVertex(N, XOff, YOff, *CntrlN, *CntrlVs);
!    tighterStructSplines = saved_tighter_splines;
! 
!    return pxp;
  }
  
*** wb.c.orig	2009-10-08 10:49:04.000000000 -0700
--- wb.c	2009-10-08 10:27:51.000000000 -0700
***************
*** 16,20 ****
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/wb.c,v 1.43 2009/10/02 15:31:24 william Exp $
   */
  
--- 16,20 ----
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/wb.c,v 1.44 2009/10/08 16:46:41 william Exp $
   */
  
***************
*** 2757,2761 ****
     if (!gstWBInfo.do_whiteboard) return TRUE;
  
! #if (defined(PTHREAD) || defined(HAVE_LIBPTHREAD))
     sprintf(gszMsgBox, TgLoadString(STID_NO_PTHREAD_CONTINUE), TOOL_NAME,
           TOOL_NAME, TOOL_NAME);
--- 2757,2761 ----
     if (!gstWBInfo.do_whiteboard) return TRUE;
  
! #if (!defined(PTHREAD) && !defined(HAVE_LIBPTHREAD))
     sprintf(gszMsgBox, TgLoadString(STID_NO_PTHREAD_CONTINUE), TOOL_NAME,
           TOOL_NAME, TOOL_NAME);
***************
*** 2764,2768 ****
     SendCommandToSelf(CMDID_QUIT, 0);
     return FALSE;
! #endif /* (defined(PTHREAD) || defined(HAVE_LIBPTHREAD)) */
  
     if (!RMCastInit()) {
--- 2764,2768 ----
     SendCommandToSelf(CMDID_QUIT, 0);
     return FALSE;
! #endif /* (!defined(PTHREAD) && !defined(HAVE_LIBPTHREAD)) */
  
     if (!RMCastInit()) {
*** patchlvl.h.orig	2009-10-08 10:49:04.000000000 -0700
--- patchlvl.h	2009-10-08 10:27:49.000000000 -0700
***************
*** 16,20 ****
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/patchlvl.h,v 1.9 2009/09/28 22:20:11 william Exp $
   */
  
--- 16,20 ----
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * @(#)$Header: /mm2/home/cvs/bc-src/tgif/patchlvl.h,v 1.10 2009/10/07 04:19:07 william Exp $
   */
  
***************
*** 22,26 ****
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 0
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
--- 22,26 ----
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 1
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
*** Imakefile.orig	2009-10-08 10:49:04.000000000 -0700
--- Imakefile	2009-10-08 10:27:51.000000000 -0700
***************
*** 32,39 ****
  XCOMM  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  XCOMM 
! XCOMM  @(#)$Header: /mm2/home/cvs/bc-src/tgif/Imakefile,v 1.140 2009/10/04 16:31:46 william Exp $
  XCOMM 
  
! TGIFVERSION	= 4.2
  
  EXTDEFINES	= -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\
--- 32,39 ----
  XCOMM  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  XCOMM 
! XCOMM  @(#)$Header: /mm2/home/cvs/bc-src/tgif/Imakefile,v 1.142 2009/10/08 01:49:29 william Exp $
  XCOMM 
  
! TGIFVERSION	= 4.2.1
  
  EXTDEFINES	= -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\
***************
*** 345,348 ****
--- 345,350 ----
   */
  
+ ICONSDIR =icons/
+ 
  MakeDirectories(install,$(TGIFDIR))
  InstallNonExec(tgif.Xdefaults,$(TGIFDIR))
***************
*** 380,384 ****
  SPICEDIR =spice/
  XBMDIR =xbm/
- ICONSDIR =icons/
  RMCASTDIR_QPL =rmcast-qpl
  RMCASTDIR_GPL =rmcast-gpl
--- 382,385 ----
*** HISTORY.orig	2009-10-08 10:49:04.000000000 -0700
--- HISTORY	2009-10-08 10:27:48.000000000 -0700
***************
*** 1,2 ****
--- 1,6 ----
+ -----------------------> tgif-4.2 => tgif-4.2.1 <-----------------------
+ 1)  Fix a bug with rotated circles.
+ 2)  Fix a bug with <ALT>c not working on Mac OS X.
+ 
  -----------------------> tgif-4.1.45 => tgif-4.2 <-----------------------
  1)  Fix bugs with copy and paste.  Thanks to Dr. Ing. Dieter Jurzitza
***************
*** 1360,1364 ****
  
  /*
!  *  @(#)$Header: /mm2/home/cvs/bc-src/tgif/HISTORY,v 1.67 2009/10/03 04:28:12 william Exp $
   */
  
--- 1364,1368 ----
  
  /*
!  *  @(#)$Header: /mm2/home/cvs/bc-src/tgif/HISTORY,v 1.69 2009/10/08 16:55:08 william Exp $
   */