Imported from svn tag fireworkz__2020_03_26__2_24_01

skswales · Aug 21, 2022 · 402e569 · 402e569
1 parent a1f355d
commit 402e569
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 22 deletions.
diff --git a/docs/UserGuide/firewrkz.chm b/docs/UserGuide/firewrkz.chm
diff --git a/t5/Build/windows/OUTx86/BLDCD2.BAT b/t5/Build/windows/OUTx86/BLDCD2.BAT
@@ -7,7 +7,7 @@
 pushd %~dp0
 IF NOT EXIST BLDCD2.BAT EXIT
 
-set OUT_DIR=fwin-22400
+set OUT_DIR=fwin-22401
 
 rmdir /s /q                                            %OUT_DIR%
 mkdir                                                  %OUT_DIR%\

diff --git a/t5/Build/windows/OUTx86/firewrkz-x86.iss b/t5/Build/windows/OUTx86/firewrkz-x86.iss
@@ -24,8 +24,8 @@ MinVersion=5.1sp3
 ; Require XP SP3
 ; AppVersion=2.xx.yy
 ; AppVerName=Colton Software Fireworkz 2.xx.yy
-AppVersion=2.24.00
-AppVerName=Colton Software Fireworkz 2.24.00
+AppVersion=2.24.01
+AppVerName=Colton Software Fireworkz 2.24.01
 AppCopyright=Copyright (C) 1992-2020 Colton Software
 AppId=Colton Fireworkz for Windows (32-bit)
 AppName=Colton Software Fireworkz for Windows (32-bit)

diff --git a/t5/cmodules/ev_fndat.c b/t5/cmodules/ev_fndat.c
@@ -183,7 +183,7 @@ ss_string_ini_cap(
 PROC_EXEC_PROTO(c_dayname)
 {
     PC_USTR ustr_dayname;
-    S32 day;
+    S32 weekday;
     S32 day_idx = 0;
 
     exec_func_ignore_parms();
@@ -194,9 +194,9 @@ PROC_EXEC_PROTO(c_dayname)
         if(SS_DATE_NULL == ss_data_get_date_date(args[0]))
             exec_func_status_return(p_ss_data_res, EVAL_ERR_NODATE);
 
-        day = ((ss_data_get_date_date(args[0]) + 1) % 7) + 1; /* [1 (Sunday),7 (Saturday)] - obviously can NOT be modified */
+        weekday = ((ss_data_get_date_date(args[0]) + 1) % 7) + 1; /* [1 (Sunday),7 (Saturday)] - obviously can NOT be modified */
 
-        day_idx = day - 1; /* [0,6] */
+        day_idx = weekday - 1; /* [0,6] */
 
         if(n_args > 1)
             exec_func_status_return(p_ss_data_res, EVAL_ERR_FUNARGS);
@@ -206,7 +206,7 @@ PROC_EXEC_PROTO(c_dayname)
     case DATA_ID_WORD8:
     case DATA_ID_WORD16:
     case DATA_ID_WORD32:
-        day = ss_data_get_integer(args[0]); /* usually  [1 (Sunday),7 (Saturday)] - may be modified - will range reduce in any case at the end */
+        weekday = ss_data_get_integer(args[0]); /* usually  [1 (Sunday),7 (Saturday)] - may be modified - will range reduce in any case at the end */
 
         if(n_args > 1)
         {
@@ -219,11 +219,11 @@ PROC_EXEC_PROTO(c_dayname)
                 break;
 
             case 2: /* Monday is day one, system 1 */
-                day += 1;
+                weekday += 1;
                 break;
 
             case 3: /* Monday is day zero */
-                day += 2;
+                weekday += 2;
                 break;
 
             case 11: /* Monday is day one, system 1 */
@@ -233,12 +233,12 @@ PROC_EXEC_PROTO(c_dayname)
             case 15: /* Friday is day one, system 1 */
             case 16: /* Saturday is day one, system 1 */
             case 17: /* Sunday is day one, system 1 */
-                day += (mode - 10);
+                weekday += (mode - 10);
                 break;
 
             case 21: /* Monday is day one, system 2 (ISO 8601) */
             case 150: /* Monday is day one, system 2 (ISO 8601 - as LibreOffice WEEKNUM() for interoperability with Gnumeric) */
-                day += 1;
+                weekday += 1;
                 break;
 
             default:
@@ -247,7 +247,7 @@ PROC_EXEC_PROTO(c_dayname)
             }
         }
 
-        div_t d = div(day - 1, 7);
+        div_t d = div(weekday - 1, 7);
         if(d.rem < 0)
             day_idx = d.rem + 7; /* -> [0,6] */
         else
@@ -772,7 +772,7 @@ PROC_EXEC_PROTO(c_weekday)
     if(SS_DATE_NULL == ss_data_get_date_date(args[0]))
         exec_func_status_return(p_ss_data_res, EVAL_ERR_NODATE);
 
-    weekday = (ss_data_get_date_date(args[0]) + 1) % 7;
+    weekday = ((ss_data_get_date_date(args[0]) + 1) % 7) + 1; /* [1 (Sunday),7 (Saturday)] */
 
     if(n_args > 1)
     {

diff --git a/t5/common/mf_mid b/t5/common/mf_mid
@@ -12,7 +12,7 @@
 
 #TEXTUAL_VERSION_NUMBER=2.xx.yy (yy usually 00)
 TEXTUAL_VERSION_NUMBER=2.24
-#TEXTUAL_VERSION_NUMBER=2.24.01
+TEXTUAL_VERSION_NUMBER=2.24.01
 # this goes in !Boot/!Run/Config files
 
 STUBS_VERSION_NUMBER=22400

diff --git a/t5/firewrkz/RelNotes.htm b/t5/firewrkz/RelNotes.htm
@@ -82,6 +82,11 @@ <h2 id="ReleaseHistory">Release History</h2>
     </p>
 
 
+    <h3>2.24.01 (26 Mar 2020)</h3>
+
+    <p>Fixed the WEEKDAY() spreadsheet function (broken in 2.24 when mode parameter added).</p>
+
+
     <h3>2.24 (22 Mar 2020)</h3>
 
     <h4>Date spreadsheet functions added:</h4>

diff --git a/t5/firewrkz/RelNotesW.htm b/t5/firewrkz/RelNotesW.htm
@@ -109,6 +109,13 @@ <h2 id="ReleaseHistory">Release History</h2>
     </p>
 
 
+    <h3>2.24.01 (26 Mar 2020)</h3>
+
+    <p>Fixed the WEEKDAY() spreadsheet function (broken in 2.24 when mode parameter added).</p>
+
+    <p>Windows: Updated interactive help for 2.24 changes.</p>
+
+
     <h3>2.24 (22 Mar 2020)</h3>
 
     <h4>Date spreadsheet functions added:</h4>

diff --git a/t5/firewrkz/r/RiscPkg/Control b/t5/firewrkz/r/RiscPkg/Control
@@ -4,7 +4,7 @@ Priority: Optional
 Licence: Free
 Maintainer: Colton Software <[email protected]>
 Standards-Version: 0.4.0
-Version: 2.24.0
+Version: 2.24.1
 Recommends: Fireworkz-Manuals,Fireworkz-Examples
 Description: Word Processor & Spreadsheet
  You can use Fireworkz as a word processor to write letters, reports, books, invitations, shopping lists, schedules and other documents.

diff --git a/t5/firewrkz/r32b/MakeRiscPkg,fd7 b/t5/firewrkz/r32b/MakeRiscPkg,fd7
@@ -8,7 +8,7 @@
 | Copyright (C) 1998-2015 R W Colton
 
 Set t5$Release 2_24
-|Set t5$Release 2_22_01
+Set t5$Release 2_24_01
 
 Set t5$Disc $.Temp.Fire.Fireworkz_<t5$Release>
 Set t5$Zip  $.Temp.Fire.Fireworkz_<t5$Release>/zip

diff --git a/t5/firewrkz/resource/windows/UK/config b/t5/firewrkz/resource/windows/UK/config
@@ -1,4 +1,4 @@
-{Version:2.24;22 Mar 2020;Fireworkz for Windows (UK);Colton Software;Windows-1252}
+{Version:2.24.01;26 Mar 2020;Fireworkz for Windows (UK);Colton Software;Windows-1252}
 {RowTable:1}
 {#:ObjectBindConstruct:object-id;command-suffix-character}
 {ObjectBindConstruct:0;*}

diff --git a/t5/firewrkz/resource/windows/UK/res00.rci b/t5/firewrkz/resource/windows/UK/res00.rci
@@ -31,8 +31,8 @@ BEGIN
 // The definitive list of files is in common.mf_mid
 //1:2.xx.yy
 //1:2.xx
-	0x1,	"2.24"
-	0x2,	"22 Mar 2020"
+	0x1,	"2.24.01"
+	0x2,	"26 Mar 2020"
 //
 // update date and version in the corresponding RelNotes HTML files too
 //

diff --git a/t5/ob_skel/resource/UK/msg b/t5/ob_skel/resource/UK/msg
@@ -17,8 +17,8 @@
 # The definitive list of files is in common.mf_mid
 #1:2.xx.yy
 #1:2.xx
-1:2.24
-2:22 Mar 2020
+1:2.24.01
+2:26 Mar 2020
 #
 # update date and version in the corresponding RelNotes HTML files too
 #

diff --git a/t5/ob_skel/version.h b/t5/ob_skel/version.h
@@ -8,7 +8,7 @@
 
 /* NB keep in step with other files (definitive list in common.mf_mid) */
 
-#define HEX_VERSION_NUMBER          0x22400
+#define HEX_VERSION_NUMBER          0x22401
 
 /* for Windows RC file */