src/timetable: Fix month incrementing

diff --git a/src/timetable.lua b/src/timetable.lua
index d1cd534a624f8c8653929b72dd556e1966601027..3b3b2ed89c1205a6abf4099d7f25f6a2f8802a65 100644 (file)
--- a/src/timetable.lua
+++ b/src/timetable.lua
@@ -21,7 +21,6 @@ local function year_length ( y )
 end
 
 local function month_length ( m , y )
 end
 
 local function month_length ( m , y )

-       m = ( m - 1 ) % 12 + 1

        if m == 2 then
                return is_leap ( y ) and 29 or 28
        else
        if m == 2 then
                return is_leap ( y ) and 29 or 28
        else


@@ -91,18 +90,23 @@ local function normalise ( year , month , day , hour , min , sec )
                day  = day + year_length ( year )
        end
 
                day  = day + year_length ( year )
        end
 

+       -- Lua months start from 1, need -1 and +1 around this increment
+       month = month - 1
+       year , month = increment ( year , month , 12 )
+       month = month + 1
+

        -- This could potentially be slow if `day` is very large
        while true do
                local i = month_length ( month , year )
                if day <= i then break end
                day = day - i
                month = month + 1
        -- This could potentially be slow if `day` is very large
        while true do
                local i = month_length ( month , year )
                if day <= i then break end
                day = day - i
                month = month + 1

+               if month > 12 then
+                       month = 1
+                       year = year + 1
+               end

        end
 
        end
 

-       -- Lua months start from 1, need -1 and +1 around this increment
-       year , month = increment ( year , month - 1 , 12 )
-       month = month + 1
-

        return year , month , day , hour , min , sec
 end
 
        return year , month , day , hour , min , sec
 end