Module:DafYomi - Revision history

Ypn^2 at 23:04, 27 November 2024

2024-11-27T23:04:40Z

← Previous revision		Revision as of 23:04, 27 November 2024
Line 15:		Line 15:
	return (string.gsub((string.gsub(format, "%%m", res.mas)), "%%d", res.daf + 1))		return (string.gsub((string.gsub(format, "%%m", res.mas)), "%%d", res.daf + 1))
	else		else
	return res.mas .. " " .. (res.daf + 1)		return "''" .. res.mas .. "'' " .. (res.daf + 1)
	end		end
	end		end

Ypn^2 at 17:52, 25 November 2024

2024-11-25T17:52:06Z

← Previous revision		Revision as of 17:52, 25 November 2024
Line 13:		Line 13:
	-- add 1 to daf (no daf aleph)		-- add 1 to daf (no daf aleph)
	if (format) then		if (format) then
	return string.gsub(string.gsub(format, "%%m", res.mas), "%%d", res.daf + 1)		return (string.gsub((string.gsub(format, "%%m", res.mas)), "%%d", res.daf + 1))
	else		else
	return res.mas .. " " .. (res.daf + 1)		return res.mas .. " " .. (res.daf + 1)

Ypn^2 at 17:44, 25 November 2024

2024-11-25T17:44:33Z

← Previous revision		Revision as of 17:44, 25 November 2024
Line 13:		Line 13:
	-- add 1 to daf (no daf aleph)		-- add 1 to daf (no daf aleph)
	if (format) then		if (format) then
	return ~~res.mas~~ .. " " .. (res.daf + 1)		return string.gsub(string.gsub(format, "%%m", res.mas), "%%d", res.daf + 1)
	else		else
	return res.mas .. " " .. (res.daf + 1)		return res.mas .. " " .. (res.daf + 1)

Ypn^2 at 17:38, 25 November 2024

2024-11-25T17:38:46Z

← Previous revision		Revision as of 17:38, 25 November 2024
Line 2:		Line 2:

	function p.today (frame)		function p.today (frame)
	return fromDate(os.date("!*t"))		return fromDate(os.date("!*t"), frame.args.format)
	end		end

	function p.date (frame)		function p.date (frame)
	return fromDate(frame.args)		return fromDate(frame.args, frame.args.format)
	end		end

	function fromDate (dat)		function fromDate (dat, format)
	local res = mas_daf(dat)		local res = mas_daf(dat)
	~~return~~ ~~res.mas~~ .. " ~~" ..~~ (~~res.~~daf ~~+ 1~~)		-- add 1 to daf (no daf aleph)
			if (format) then
			return res.mas .. " " .. (res.daf + 1)
			else
			return res.mas .. " " .. (res.daf + 1)
			end
	end		end

Line 20:		Line 25:

	dat = os.time(dat)		dat = os.time(dat)
	local date0 = os.time({year=2005,month=2,day=28,hour=0,min=0,sec=0})		local date0 = os.time({year=2005,month=2,day=28,hour=0,min=0,sec=0}) -- date before start of cycle

	local sinceS = dat-date0 + 200		local sinceS = dat - date0 + 200 -- for the unlikely event of anti-leap seconds
	local sinceD = math.floor(sinceS / 86400)		local sinceD = math.floor(sinceS / 86400)
	local days = sinceD % 2711		local days = sinceD % 2711

	if (days == 0) then return {mas='Niddah', daf='72'} end		if (days == 0) then return {mas='Niddah', daf='72'} end

			-- each number is the number of dapim, which is 1 less than the last daf's number

	if (days <= 63) then return {mas='Berakhot',daf=days} end		if (days <= 63) then return {mas='Berakhot',daf=days} end
Line 98:		Line 105:
	if (days <= 27) then return {mas='Keritot',daf=days} end		if (days <= 27) then return {mas='Keritot',daf=days} end
	days = days - 27		days = days - 27
	if (days <= 21) then return {mas="Me'ilah",daf=days} end		if (days <= 21) then return {mas="Me'ilah",daf=days} end -- these 4 tractates are numbered consecutively
	if (days <= 24) then return {mas='Kinnim',daf=days} end		if (days <= 24) then return {mas='Kinnim',daf=days} end
	if (days <= 32) then return {mas='Tamid',daf=days} end		if (days <= 32) then return {mas='Tamid',daf=days} end

Ypn^2: Ypn^2 moved page Module:Sandbox/ypn^2 to Module:DafYomi: Move to mainspace

2024-11-24T20:03:11Z

Ypn^2 moved page Module:Sandbox/ypn^2 to Module:DafYomi: Move to mainspace

← Previous revision	Revision as of 20:03, 24 November 2024
(No difference)

Ypn^2 at 20:01, 24 November 2024

2024-11-24T20:01:10Z

@@ Line 24: / Line 24: @@
 	local sinceS = dat-date0 + 200
 	local sinceD = math.floor(sinceS / 86400)
-	local days = sinceD % 2711 + 1
+	local days = sinceD % 2711
 	if (days <= 63) then return {mas='Berakhot',daf=days} end
@@ Line 90: / Line 92: @@
 	if (days <= 60) then return {mas='Bekhorot',daf=days} end
 	days = days - 60
 end

Ypn^2 at 19:55, 24 November 2024

2024-11-24T19:55:37Z

← Previous revision		Revision as of 19:55, 24 November 2024
Line 10:		Line 10:

	function fromDate (dat)		function fromDate (dat)
	~~return~~ mas_daf(dat~~).mas .. " " .. (mas_daf.daf + 1~~)		local res = mas_daf(dat)
			return res.mas .. " " .. (res.daf + 1)
	end		end

Line 81:		Line 82:
	if (days <= 13) then return {mas='Horayot',daf=days} end		if (days <= 13) then return {mas='Horayot',daf=days} end
	days = days - 13		days = days - 13
			if (days <= 119) then return {mas='Zevachim',daf=days} end
			days = days - 119
			if (days <= 109) then return {mas='Menachot',daf=days} end
			days = days - 109
			if (days <= 141) then return {mas='Chullin',daf=days} end
			days = days - 141
			if (days <= 60) then return {mas='Bekhorot',daf=days} end
			days = days - 60

	return sinceD		return sinceD

Ypn^2 at 19:54, 24 November 2024

2024-11-24T19:54:19Z

@@ Line 10: / Line 10: @@
 function fromDate (dat)
-	return mas_daf(dat).mas + " " + (mas_daf.daf + 1)
+	return mas_daf(dat).mas .. " " .. (mas_daf.daf + 1)
 end
@@ Line 55: / Line 55: @@
 	if (days <= 111) then return {mas='Ketubot',daf=days} end
 	days = days - 111
 	return sinceD

Ypn^2 at 19:50, 24 November 2024

2024-11-24T19:50:51Z

← Previous revision		Revision as of 19:50, 24 November 2024
Line 10:		Line 10:

	function fromDate (dat)		function fromDate (dat)
	return mas_daf.mas + " " + (mas_daf.daf + 1)		return mas_daf(dat).mas + " " + (mas_daf.daf + 1)
	end		end

Ypn^2 at 19:50, 24 November 2024

2024-11-24T19:50:31Z

← Previous revision		Revision as of 19:50, 24 November 2024
Line 2:		Line 2:

	function p.today (frame)		function p.today (frame)
	return p.fromDate(os.date("!*t"))		return fromDate(os.date("!*t"))
	end		end

	function p.date (frame)		function p.date (frame)
	return p.fromDate(frame.args)		return fromDate(frame.args)
	end		end