Resources/UK/Messages

@@ -128,30 +128,30 @@ HelpB5:\Tcurrently selected day of the week at which the alarm will go off.
 HelpB7:\Tcurrently selected year at which the alarm will go off.
 HelpB8:\Sposition the caret.|MUse the cursor keys to move the caret.
 HelpB9:\Sposition the caret.|MUse the cursor keys to move the caret or press Return to set the alarm.
-HelpC1:\Smake this a repeating alarm.
-HelpC2:\Smake this a non-repeating alarm.
-HelpC3:\Sset the repeat interval to minutes.
-HelpC4:\Sset the repeat interval to hours.
-HelpC5:\Sset the repeat interval to days.
-HelpC6:\Sset the repeat interval to weeks.
-HelpC7:\Sset the repeat interval to months.
-HelpC8:\Sset the repeat interval to years.
-HelpC9:\Sdecrease the repeat time.
-HelpD1:\Tcurrently selected repeat time.
+HelpC1:\Smake this a recurring alarm.
+HelpC2:\Smake this a non-recurring alarm.
+HelpC3:\Sset the recurrence interval to minutes.
+HelpC4:\Sset the recurrence interval to hours.
+HelpC5:\Sset the recurrence interval to days.
+HelpC6:\Sset the recurrenc interval to weeks.
+HelpC7:\Sset the recurrence interval to months.
+HelpC8:\Sset the recurrence interval to years.
+HelpC9:\Sdecrease the recurrence time.
+HelpD1:\Tcurrently selected recurrence time.
 HelpD2:\Sincrease the repeat time.
 HelpE1:\Smake this a task alarm.
-HelpE2:\Smake this a normal alarm.
+HelpE2:\Smake this a standard alarm.
 HelpE3:\Smake alarms fit into a working week.
 HelpE4:\Smake alarms fit into a full week.
 HelpE5:Click MENU to find another alarm.
-HelpE6:\Smake this a regular repeating alarm.
+HelpE6:\Smake this a regular recurring alarm.
 HelpF1:\Schange the offset into the month required.
 HelpF2:\Schange the day required.
 HelpF3:\Schange the number of months that should pass between alarms.
 HelpF4:\Tcurrently selected offset into the month.
 HelpF5:\Tcurrently selected day for the alarm to repeat on.
 HelpF6:\Tcurrently selected number of months that should pass between alarms.
-HelpF7:\Smake this a normal repeating alarm.
+HelpF7:\Smake this a standard recurring alarm.
 
 HelpG1:Year difference.
 HelpG2:Day difference.

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.87"
-Module_Version          SETA    287
+Module_MajorVersion     SETS    "2.93"
+Module_Version          SETA    293
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "03 Feb 2015"
-Module_ApplicationDate  SETS    "03-Feb-15"
+Module_Date             SETS    "17 Mar 2018"
+Module_ApplicationDate  SETS    "17-Mar-18"
 Module_ComponentName    SETS    "Alarm"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Apps/Alarm"
-Module_FullVersion      SETS    "2.87"
-Module_HelpVersion      SETS    "2.87 (03 Feb 2015)"
+Module_FullVersion      SETS    "2.93"
+Module_HelpVersion      SETS    "2.93 (17 Mar 2018)"
                         END

VersionNum

-/* (2.87)
+/* (2.93)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.87
+#define Module_MajorVersion_CMHG        2.93
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                03 Feb 2015
+#define Module_Date_CMHG                17 Mar 2018
 
-#define Module_MajorVersion             "2.87"
-#define Module_Version                  287
+#define Module_MajorVersion             "2.93"
+#define Module_Version                  293
 #define Module_MinorVersion             ""
-#define Module_Date                     "03 Feb 2015"
+#define Module_Date                     "17 Mar 2018"
 
-#define Module_ApplicationDate          "03-Feb-15"
+#define Module_ApplicationDate          "17-Mar-18"
 
 #define Module_ComponentName            "Alarm"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Apps/Alarm"
 
-#define Module_FullVersion              "2.87"
-#define Module_HelpVersion              "2.87 (03 Feb 2015)"
-#define Module_LibraryVersionInfo       "2:87"
+#define Module_FullVersion              "2.93"
+#define Module_HelpVersion              "2.93 (17 Mar 2018)"
+#define Module_LibraryVersionInfo       "2:93"

bas/Clock

@@ -217,7 +217,8 @@ DEFPROCgettime
    SYS"Wimp_TextOp",1,t$,0 TO len%
    icon_width%  =len% +40
 
-   SYS"Font_CharBBox",font%,ASC("0"),1<<4 TO ,,miny%,,maxy%
+   SYS"Font_CharBBox",font%,ASC("0"),0 TO ,,miny%,,maxy%
+   SYS"Font_Converttopoints",,20,68 TO ,icon_xoff_mp%,icon_height_mp%
    cur_fonty% =maxy% -miny%
   ENDIF
  
@@ -247,8 +248,8 @@ DEFPROCgettime
    VDU 23,17,7,%110,16 >>>dx%;32 >>>dy%|
    MOVE (icon_width% - (16 * LENt$)) / 2,46:PRINT t$
   ELSE
-   SYS"Wimp_TextOp",0,0,&FFFFFF00
-   SYS"Wimp_TextOp",&00000002,t$,-1,-1,20,(icon_height% -cur_fonty%) /2
+   SYS"XColourTrans_SetFontColours",font%,&ffffff00,0,14
+   SYS"XFont_Paint",font%,t$,(1 << 8),icon_xoff_mp%,(icon_height_mp% - cur_fonty%) DIV 2
   ENDIF
  ENDIF
  SYS"OS_SpriteOp",W%,X%,Y%,Z%
@@ -430,14 +431,6 @@ DEFPROCset_clock_from_alarm_rec(ptr%)
  PROCalarm_rec_to_fivebt(ptr%,Q2%)
  SYS"Territory_SetTime",Q2%
 ENDPROC
-:
-DEFPROCtoggle_tz
- LOCAL i%,f%
- SYS"OS_Byte",161,&DC TO ,,i%
- i%=i% EOR %10000000
- SYS"XOS_Byte",162,&DC,i% TO i%;f%
- IF(f%AND1) PROCok(FNrtoz(i%+4))
-ENDPROC
 
 REM *************************************************************************
 REM Clock validation
@@ -461,6 +454,8 @@ ENDPROC
 :
 DEFPROCvalidate_ordinals(RETURN hr%,RETURN mi%,RETURN dy%,RETURN mo%,RETURN yr%,RETURN error%)
  IFyr%>2247 yr%=2247:error%=TRUE:ENDPROC
+ WHILE mo%<1 yr%-=1:mo%+=FNmonthsinyear(yr%):ENDWHILE
+ WHILE mo%>FNmonthsinyear(yr%) mo%-=FNmonthsinyear(yr%):yr%+=1:ENDWHILE
  WHILE mi%<0 mi%+=60:hr%-=1:ENDWHILE
  WHILE mi%>59 mi%-=60:hr%+=1:ENDWHILE
  WHILE hr%<0 hr%+=24:dy%-=1:ENDWHILE
@@ -471,8 +466,6 @@ DEFPROCvalidate_ordinals(RETURN hr%,RETURN mi%,RETURN dy%,RETURN mo%,RETURN yr%,
   mo%+=1
   WHILEmo%>FNmonthsinyear(yr%) mo%-=FNmonthsinyear(yr%):yr%+=1:ENDWHILE
  ENDWHILE
- WHILE mo%<1 yr%-=1:mo%+=FNmonthsinyear(yr%):ENDWHILE
- WHILE mo%>FNmonthsinyear(yr%) mo%-=FNmonthsinyear(yr%):yr%+=1:ENDWHILE
  IF yr%<1901 yr%=1901
  IF yr%>2247 yr%=2247:error%=TRUE
 ENDPROC

bas/Main

@@ -187,7 +187,6 @@ DEFPROCinit_config
  alarm_autosave%=((i% AND %10000)<>0)
  fivedayweek%   =((i% AND %100000)<>0)
  silent_alarm%  =((i% AND %1000000)<>0)
- alarm_in_dst%  =((i% AND %10000000)<>0)
  $Q1%=FNread_system_string("Alarm$Options","")
  REM format is -timeout value -weekwork days -format string
  SYS"XOS_ReadArgs","timeout/k,weekwork/k,format/k",Q1%,Q%,2048 TO ;i%

bas/Utils

@@ -786,12 +786,7 @@ DEFFNgot_time_setup
 
 DEFPROCsave_config
  LOCAL cmos%,cli$,cli2$,i%,opt_file$,f%
- cmos%=format%
- IFalarm_confirm%  cmos%=cmos% OR %1000
- IFalarm_autosave% cmos%=cmos% OR %10000
- IFfivedayweek%    cmos%=cmos% OR %100000
- IFsilent_alarm%   cmos%=cmos% OR %1000000
- IFalarm_in_dst%   cmos%=cmos% OR %10000000
+
  cli$ =FNbuild_alarm_options
  SYS"OS_CLI",cli$
  
@@ -814,6 +809,12 @@ DEFPROCsave_config
   SYS"XOS_File",18,opt_file$,&FEB
  ENDIF
  
+ SYS"XOS_Byte",161,&DC TO ,,cmos%
+ cmos%=(cmos% AND &80) OR format% :REM Preserve DST, mix in display format
+ IFalarm_confirm%  cmos%=cmos% OR %1000
+ IFalarm_autosave% cmos%=cmos% OR %10000
+ IFfivedayweek%    cmos%=cmos% OR %100000
+ IFsilent_alarm%   cmos%=cmos% OR %1000000
  SYS"XOS_Byte",162,&DC,cmos% TO i%;f%
  IF(f%AND1) THEN PROCok(FNrtoz(i%+4))
 ENDPROC

s/Browser

@@ -91,10 +91,10 @@ entry
         SUB     R4, R4, #52             ; y% = buff%!16 - buff%!24 - 52
         LDR     R5, [R2, #40]
         SUB     R5, R4, R5
-        DivRem  R6, R5, #48, R7         ; y1% = (y% - buff%!40) DIV 48
+        DivRem  R6, R5, #48, R7, norem  ; y1% = (y% - buff%!40) DIV 48
         LDR     R5, [R2, #32]
         SUB     R5, R4, R5
-        DivRem  R7, R5, #48, R0         ; y2% = (y% - buff%!32) DIV 48
+        DivRem  R7, R5, #48, R0, norem  ; y2% = (y% - buff%!32) DIV 48
         LDR     R2, alarm_head
         ; register usage so far
         ; R2 - alarm_head% ie p%