Изменения

дополнение
Строка 669: Строка 669:  
end
 
end
 
 
 +
local cal = args[2]:lower() or "г"
 
local bc,wd,wm,wy,sq_brts =  
 
local bc,wd,wm,wy,sq_brts =  
 
is(args["bc"]),
 
is(args["bc"]),
Строка 675: Строка 676:  
is(args["wy"]),
 
is(args["wy"]),
 
is(args["sq_brts"])
 
is(args["sq_brts"])
 
+
 +
local datein = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)}
 
year = astroyear(purif(year),bc)
 
year = astroyear(purif(year),bc)
   −
local jdate = {["year"]=purif(year), ["month"]=purif(month), ["day"]=purif(day)}
+
jdate, gdate = recalc(datein,cal)
local gdate = jd2gri(jul2jd(jdate))
      
     local yearmark = "года"
 
     local yearmark = "года"
Строка 690: Строка 691:  
     else yearmark = trim(ym) or "года" end
 
     else yearmark = trim(ym) or "года" end
 
     end
 
     end
   
+
 
 
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)
 
return double_couple(jdate, gdate, wd, wm, wy, sq_brts, yearmark)
 
end
 
end
Анонимный участник