home *** CD-ROM | disk | FTP | other *** search
- *** /tmp/,RCSt1a14217 Thu Jan 4 14:29:02 1990
- --- Makefile Thu Jan 4 14:28:40 1990
- ***************
- *** 1,4
- ! # $Header: Makefile,v 2.4 89/12/19 12:25:42 billr Exp $
- #
- #DATELIB_DIR Directory containing the Date Library
- #PRINT_CMD Command to send postscript to appropriate printer
-
- --- 1,4 -----
- ! # $Header: Makefile,v 2.5 90/01/04 14:28:28 billr Exp $
- #
- #DATELIB_DIR Directory containing the Date Library
- #PRINT_CMD Command to send postscript to appropriate printer
- ***************
- *** 34,39
-
- CC = cc
- DEFINES= #-DDATELIB_DIR=\"./dates\" -DSTART_HOUR=7 -DEND_HOUR=19 -DSTART_YEAR=88
- CFLAGS= -g ${DEFINES}
- CC_CFLAGS = ${CFLAGS} -DCALENCHECK
- LIBS= -lsuntool -lsunwindow -lpixrect -lm
-
- --- 34,41 -----
-
- CC = cc
- DEFINES= #-DDATELIB_DIR=\"./dates\" -DSTART_HOUR=7 -DEND_HOUR=19 -DSTART_YEAR=88
- + # Warning: SunOS 4.x: Using -O[n] on "wpaint.c" causes the week display
- + # to not work properly. Other files seem to compile OK with -O[1-4].
- CFLAGS= -g ${DEFINES}
- CC_CFLAGS = ${CFLAGS} -DCALENCHECK
- LIBS= -lsuntool -lsunwindow -lpixrect -lm
- *** /tmp/,RCSt1a14398 Thu Jan 4 15:09:36 1990
- --- PATCHLOG Thu Jan 4 15:09:06 1990
- ***************
- *** 1,4
- ! # $Header: PATCHLOG,v 2.6 89/12/15 17:13:23 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.6 89/12/15 17:13:23 billr
-
- --- 1,4 -----
- ! # $Header: PATCHLOG,v 2.7 90/01/04 15:08:48 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.7 90/01/04 15:08:48 billr
- ***************
- *** 1,6
- # $Header: PATCHLOG,v 2.6 89/12/15 17:13:23 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.6 89/12/15 17:13:23 billr
- # Patchlevel 5 of calentool fixes the following bugs and adds features:
- #
-
- --- 1,21 -----
- # $Header: PATCHLOG,v 2.7 90/01/04 15:08:48 billr Exp $
-
- #$Log: PATCHLOG,v $
- + # Revision 2.7 90/01/04 15:08:48 billr
- + # Patchlevel 6 of calentool fixes the following bugs:
- + #
- + #===========
- + #Bugs Fixed:
- + #===========
- + #Fix bug where holidays are not shown in the day display if there
- + # are no regular appointments for that day. <smb@research.att.com>,
- + # <phil@grumpy.cgrg.ohio-state.edu>
- + #Fix bug that caused the year display to be off by one on its display.
- + # <seamans@seaimage@nlm.nih.gov>, <shen@burma.crd.ge.COM>
- + #Fixed typos in the world and space date files. <rodgers@maxwell.mmwb.ucsf.edu>
- + #Added a warning to the Makefile regarding optimizing the "wpaint.c" file.
- + # <seamans@seaimage@nlm.nih.gov>
- + #
- # Revision 2.6 89/12/15 17:13:23 billr
- # Patchlevel 5 of calentool fixes the following bugs and adds features:
- #
- *** /tmp/,RCSt1a14237 Thu Jan 4 14:31:04 1990
- --- dpaint.c Thu Jan 4 14:30:43 1990
- ***************
- *** 1,5
- /*
- ! * $Header: dpaint.c,v 2.4 89/12/15 17:17:25 billr Exp $
- */
- /*
- * dpaint.c
-
- --- 1,5 -----
- /*
- ! * $Header: dpaint.c,v 2.5 90/01/04 14:30:12 billr Exp $
- */
- /*
- * dpaint.c
- ***************
- *** 224,230
- * First check to see if the user has selected any holiday
- * options and add them in.
- */
- ! if (a_dates(&appt, holiday_a))
- add_note(&appt);
- if (c_dates(&appt, holiday_c))
- add_note(&appt);
-
- --- 224,231 -----
- * First check to see if the user has selected any holiday
- * options and add them in.
- */
- ! if (a_dates(&appt, holiday_a)) {
- ! some_appt |= (holiday_a == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- }
- if (c_dates(&appt, holiday_c)) {
- ***************
- *** 226,232
- */
- if (a_dates(&appt, holiday_a))
- add_note(&appt);
- ! if (c_dates(&appt, holiday_c))
- add_note(&appt);
- working(FALSE);
- if (i = i_dates(&appt, holiday_i))
-
- --- 227,235 -----
- if (a_dates(&appt, holiday_a)) {
- some_appt |= (holiday_a == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- ! }
- ! if (c_dates(&appt, holiday_c)) {
- ! some_appt |= (holiday_c == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- }
- working(FALSE);
- ***************
- *** 228,233
- add_note(&appt);
- if (c_dates(&appt, holiday_c))
- add_note(&appt);
- working(FALSE);
- if (i = i_dates(&appt, holiday_i))
- if (i == 2) {
-
- --- 231,237 -----
- if (c_dates(&appt, holiday_c)) {
- some_appt |= (holiday_c == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- + }
- working(FALSE);
- if (i = i_dates(&appt, holiday_i))
- if (i == 2) {
- ***************
- *** 240,246
- /* now second half of string in the next note */
- strcpy(appt.str, &buf[(int)(sptr-appt.str)+1]);
- add_note(&appt);
- ! } else
- add_note(&appt);
- working(TRUE);
- if (j_dates(&appt, holiday_j))
-
- --- 244,252 -----
- /* now second half of string in the next note */
- strcpy(appt.str, &buf[(int)(sptr-appt.str)+1]);
- add_note(&appt);
- ! some_appt |= (holiday_i == 1 ? SOME_MKNOTES : SOME_NOTES);
- ! } else {
- ! some_appt |= (holiday_i == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- }
- working(TRUE);
- ***************
- *** 242,247
- add_note(&appt);
- } else
- add_note(&appt);
- working(TRUE);
- if (j_dates(&appt, holiday_j))
- add_note(&appt);
-
- --- 248,254 -----
- } else {
- some_appt |= (holiday_i == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- + }
- working(TRUE);
- if (j_dates(&appt, holiday_j)) {
- some_appt |= (holiday_j == 1 ? SOME_MKNOTES : SOME_NOTES);
- ***************
- *** 243,249
- } else
- add_note(&appt);
- working(TRUE);
- ! if (j_dates(&appt, holiday_j))
- add_note(&appt);
- if (s_dates(&appt, holiday_s))
- add_note(&appt);
-
- --- 250,257 -----
- add_note(&appt);
- }
- working(TRUE);
- ! if (j_dates(&appt, holiday_j)) {
- ! some_appt |= (holiday_j == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- }
- if (s_dates(&appt, holiday_s)) {
- ***************
- *** 245,251
- working(TRUE);
- if (j_dates(&appt, holiday_j))
- add_note(&appt);
- ! if (s_dates(&appt, holiday_s))
- add_note(&appt);
- #endif
-
-
- --- 253,261 -----
- if (j_dates(&appt, holiday_j)) {
- some_appt |= (holiday_j == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- ! }
- ! if (s_dates(&appt, holiday_s)) {
- ! some_appt |= (holiday_s == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- }
- #endif
- ***************
- *** 247,252
- add_note(&appt);
- if (s_dates(&appt, holiday_s))
- add_note(&appt);
- #endif
-
- /*
-
- --- 257,263 -----
- if (s_dates(&appt, holiday_s)) {
- some_appt |= (holiday_s == 1 ? SOME_MKNOTES : SOME_NOTES);
- add_note(&appt);
- + }
- #endif
-
- /*
- *** /tmp/,RCSt1a14252 Thu Jan 4 14:32:26 1990
- --- patchlevel.h Thu Jan 4 14:31:58 1990
- ***************
- *** 1,5
- /*
- ! * $Header: patchlevel.h,v 2.6 89/12/15 17:18:00 billr Exp $
- */
- /*
- * patchlevel.h - current patchlevel of calentool program
-
- --- 1,5 -----
- /*
- ! * $Header: patchlevel.h,v 2.7 90/01/04 14:31:42 billr Exp $
- */
- /*
- * patchlevel.h - current patchlevel of calentool program
- ***************
- *** 5,8
- * patchlevel.h - current patchlevel of calentool program
- */
-
- ! #define PATCHLEVEL 5
-
- --- 5,8 -----
- * patchlevel.h - current patchlevel of calentool program
- */
-
- ! #define PATCHLEVEL 6
- *** /tmp/,RCSt1a14262 Thu Jan 4 14:33:27 1990
- --- version.c Thu Jan 4 14:33:10 1990
- ***************
- *** 1,5
- /*
- ! * $Header: version.c,v 2.6 89/12/15 17:18:32 billr Exp $
- */
- /*
- * version.c - current version of calentool program
-
- --- 1,5 -----
- /*
- ! * $Header: version.c,v 2.7 90/01/04 14:33:02 billr Exp $
- */
- /*
- * version.c - current version of calentool program
- ***************
- *** 24,27
- * notice remains intact.
- */
-
- ! char version[] = "Calendar Tool V2.1p5";
-
- --- 24,27 -----
- * notice remains intact.
- */
-
- ! char version[] = "Calendar Tool V2.1p6";
- *** /tmp/,RCSt1a14267 Thu Jan 4 14:34:09 1990
- --- ypaint.c Thu Jan 4 14:29:46 1990
- ***************
- *** 1,5
- /*
- ! * $Header: ypaint.c,v 2.2 89/12/15 17:18:43 billr Exp $
- */
- /*
- * ypaint.c
-
- --- 1,5 -----
- /*
- ! * $Header: ypaint.c,v 2.3 90/01/04 14:29:27 billr Exp $
- */
- /*
- * ypaint.c
- ***************
- *** 33,39
- {
- int monthnr, daynr, boxnr, i, j, k, thismonth;
- int row, col, x, y;
- ! int busy_today[366], startbox, nrdays, yrday, extra_days;
- char title[5], c[3], buf[100];
- Rect *rect;
- struct tm Save;
-
- --- 33,39 -----
- {
- int monthnr, daynr, boxnr, i, j, k, thismonth;
- int row, col, x, y;
- ! int busy_today[367], startbox, nrdays, yrday, extra_days;
- char title[5], c[3], buf[100];
- Rect *rect;
- struct tm Save;
- ***************
- *** 61,67
- print_button(TRUE);
-
- /* Which days have appointments? */
- ! for (i=0; i<dysize(current.tm_year + 1900); i++)
- busy_today[i] = 0;
- Save = current;
- current.tm_mon = JAN;
-
- --- 61,67 -----
- print_button(TRUE);
-
- /* Which days have appointments? */
- ! for (i=1; i<=dysize(current.tm_year + 1900); i++)
- busy_today[i] = 0;
- Save = current;
- current.tm_mon = JAN;
- ***************
- *** 187,193
- * check to see if the user has selected any holiday
- * options and add them in.
- */
- ! for (i=0; i<dysize(current.tm_year + 1900); i++) {
- working(TRUE);
- if (holiday_a == 1 && a_dates(&appt, holiday_a))
- busy_today[i]++;
-
- --- 187,193 -----
- * check to see if the user has selected any holiday
- * options and add them in.
- */
- ! for (i=1; i<=dysize(current.tm_year + 1900); i++) {
- working(TRUE);
- if (holiday_a == 1 && a_dates(&appt, holiday_a))
- busy_today[i]++;
- ***************
- *** 228,234
-
- /* draw months */
- monthnr = 0;
- ! yrday = 0;
- extra_days = 0;
- if (monday_first) {
- if (First.tm_wday == SUN)
-
- --- 228,234 -----
-
- /* draw months */
- monthnr = 0;
- ! yrday = 1;
- extra_days = 0;
- if (monday_first) {
- if (First.tm_wday == SUN)
- *** /tmp/,RCSt1a13496 Thu Jan 4 10:24:27 1990
- --- dates/world Thu Jan 4 10:23:34 1990
- ***************
- *** 1,5
- # CalenTool V2 - DO NOT REMOVE THIS LINE
- ! # $Header: world,v 2.3 89/12/18 17:14:00 billr Exp $
- # Special days file for calentool (rel 2.1); modified from network posting by
- # RPC Rodgers, UCSF, Nov. 1988
- # Various holidays commemorated around the world (non-US and Canadian)
-
- --- 1,5 -----
- # CalenTool V2 - DO NOT REMOVE THIS LINE
- ! # $Header: world,v 2.4 90/01/04 10:23:23 billr Exp $
- # Special days file for calentool (rel 2.1); modified from network posting by
- # RPC Rodgers, UCSF, Nov. 1988
- # Various holidays commemorated around the world (non-US and Canadian)
- ***************
- *** 41,47
- ** 01 23 99 99 00 Feast of St. Ildefonsus
- ** 01 24 99 99 00 Economic Liberation Day (Togo)
- ** 01 26 99 99 00 Republic Day (India)
- ! ** 01 26 99 99 00 Australia Day (Australia)
- ** 02 01 99 99 00 Chinese New Year Holiday (3 days) (Taiwan)
- ** 02 03 99 99 00 Setsubun, Change of Season or "Bean Throwing Night" (Japan)
- ** 02 04 99 99 00 Independence Commemoration Day (Sri Lanka)
-
- --- 41,47 -----
- ** 01 23 99 99 00 Feast of St. Ildefonsus
- ** 01 24 99 99 00 Economic Liberation Day (Togo)
- ** 01 26 99 99 00 Republic Day (India)
- ! ** 01 26 99 99 00 Australia Day; observed on nearest Monday (Australia)
- ** 02 01 99 99 00 Chinese New Year Holiday (3 days) (Taiwan)
- ** 02 03 99 99 00 Setsubun, Change of Season or "Bean Throwing Night" (Japan)
- ** 02 04 99 99 00 Independence Commemoration Day (Sri Lanka)
- ***************
- *** 358,365
- ** 09 24 99 99 00 Republic Day (Trinidad, Tobago)
- ** 09 25 99 99 00 Army Day (Mozambique)
- ** 09 25 99 99 00 Referendum Day (Rwanda)
- ! ** 09 26 99 99 00 National Day (Maldives, Yemen Deomcratic Republic)
- ! ** 09 26 99 99 00 Revolution Anniversary Day (Yemen Arab)
- ** 09 27 99 99 00 Feast of Finding the True Cross (Ethiopia)
- ** 09 28 99 99 00 Confucious' Day (Taiwan)
- ** 09 29 99 99 00 Battle of Boqueron (Paraquay)
-
- --- 358,365 -----
- ** 09 24 99 99 00 Republic Day (Trinidad, Tobago)
- ** 09 25 99 99 00 Army Day (Mozambique)
- ** 09 25 99 99 00 Referendum Day (Rwanda)
- ! ** 09 26 99 99 00 National Day (Maldives, Yemen Democratic Republic)
- ! ** 09 26 99 99 00 Revolution Anniversary Day (Yemen Arab Republic)
- ** 09 27 99 99 00 Feast of Finding the True Cross (Ethiopia)
- ** 09 28 99 99 00 Confucious' Day (Taiwan)
- ** 09 29 99 99 00 Battle of Boqueron (Paraquay)
- ***************
- *** 364,369
- ** 09 28 99 99 00 Confucious' Day (Taiwan)
- ** 09 29 99 99 00 Battle of Boqueron (Paraquay)
- ** 09 30 99 99 00 Botswanna Day (Botswanna)
- ** 10 01 99 99 00 Armed Forces Day (South Korea)
- ** 10 01 99 99 00 Independence Day (Nigeria)
- #** 10 01 99 99 00 Labor Day (Australia) [really 1st Monday in October]
-
- --- 364,370 -----
- ** 09 28 99 99 00 Confucious' Day (Taiwan)
- ** 09 29 99 99 00 Battle of Boqueron (Paraquay)
- ** 09 30 99 99 00 Botswanna Day (Botswanna)
- + ** 10 Mo 99 99 00 [1] Labor Day (Australia)
- ** 10 01 99 99 00 Armed Forces Day (South Korea)
- ** 10 01 99 99 00 Independence Day (Nigeria)
- ** 10 01 99 99 00 National Liberation Day (2 days) (China)
- ***************
- *** 366,372
- ** 09 30 99 99 00 Botswanna Day (Botswanna)
- ** 10 01 99 99 00 Armed Forces Day (South Korea)
- ** 10 01 99 99 00 Independence Day (Nigeria)
- - #** 10 01 99 99 00 Labor Day (Australia) [really 1st Monday in October]
- ** 10 01 99 99 00 National Liberation Day (2 days) (China)
- ** 10 01 99 99 00 Public Holiday (Botswanna)
- ** 10 02 99 99 00 Anniversary of Guinean Independence (Guinea)
-
- --- 367,372 -----
- ** 10 Mo 99 99 00 [1] Labor Day (Australia)
- ** 10 01 99 99 00 Armed Forces Day (South Korea)
- ** 10 01 99 99 00 Independence Day (Nigeria)
- ** 10 01 99 99 00 National Liberation Day (2 days) (China)
- ** 10 01 99 99 00 Public Holiday (Botswanna)
- ** 10 02 99 99 00 Anniversary of Guinean Independence (Guinea)
- ***************
- *** 398,404
- ** 10 12 99 99 00 Our Lady Aparecida Day (Brazil)
- ** 10 12 99 99 00 Pan American Day (Belize)
- ** 10 13 99 99 00 St. Edward's Day - patron saint of England
- ! ** 10 14 99 99 00 National Day (Yemen Arab Repyblic)
- ** 10 14 99 99 00 Young People's Day (Zaire)
- ** 10 15 99 99 00 Evacuation Day (Tunisia)
- ** 10 17 99 99 00 Anniversary of Dessaline's Death (Haiti)
-
- --- 398,404 -----
- ** 10 12 99 99 00 Our Lady Aparecida Day (Brazil)
- ** 10 12 99 99 00 Pan American Day (Belize)
- ** 10 13 99 99 00 St. Edward's Day - patron saint of England
- ! ** 10 14 99 99 00 National Day (Yemen Arab Republic)
- ** 10 14 99 99 00 Young People's Day (Zaire)
- ** 10 15 99 99 00 Evacuation Day (Tunisia)
- ** 10 17 99 99 00 Anniversary of Dessaline's Death (Haiti)
- ***************
- *** 466,472
- ** 11 29 99 99 00 Goodwill Day (Liberia)
- ** 11 29 99 99 00 Liberation Day (Albania)
- ** 11 29 99 99 00 National Day (Burma)
- ! ** 11 30 99 99 00 Independence Day (Barbados, Yemen Deomcratic Republic)
- ** 11 30 99 99 00 National Day (Benin)
- ** 11 30 99 99 00 National Heroes Day (Philippines)
- ** 12 01 99 99 00 Anniversary of Restoration of Independence (Portugal)
-
- --- 466,472 -----
- ** 11 29 99 99 00 Goodwill Day (Liberia)
- ** 11 29 99 99 00 Liberation Day (Albania)
- ** 11 29 99 99 00 National Day (Burma)
- ! ** 11 30 99 99 00 Independence Day (Barbados, Yemen Democratic Republic)
- ** 11 30 99 99 00 National Day (Benin)
- ** 11 30 99 99 00 National Heroes Day (Philippines)
- ** 12 01 99 99 00 Anniversary of Restoration of Independence (Portugal)
-