Module:Cite Talmud - Revision history

Coolreader18: Re-add html space entity handling

2023-12-05T04:46:17Z

Re-add html space entity handling

← Previous revision		Revision as of 04:46, 5 December 2023
Line 1:		Line 1:
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local yesno = require('Module:yesno')		local yesno = require('Module:yesno')

			local function tidyVal(key, val)
			if type(val) == 'string' then
			val = val:gsub(" ", ' '):match('^%s(.-)%s$')
			if val == '' then
			return nil
			else
			return val
			end
			else
			return val
			end
			end


	local talmud = {}		local talmud = {}
Line 7:		Line 21:

	function talmud.generate_citation(frame)		function talmud.generate_citation(frame)
	local args = getArgs(frame, { wrappers = 'Template:Cite Talmud' })		local args = getArgs(frame, { wrappers = 'Template:Cite Talmud', valueFunc = tidyVal })
	jb = args[1] or 'b'		jb = args[1] or 'b'
	if not talmud.jb_key[jb] then		if not talmud.jb_key[jb] then

Coolreader18: Fix typo

2023-12-05T04:36:33Z

Fix typo

← Previous revision		Revision as of 04:36, 5 December 2023
Line 13:		Line 13:
	end		end
	tractate = args[2]		tractate = args[2]
	daf = args[4] or ~~template_args~~[3] -- These are page or folio numbers as described at Talmud#Slavuta Talmud 1795 and Vilna Talmud 1835. Ranges are accepted, eg. 2b-4a		daf = args[4] or args[3] -- These are page or folio numbers as described at Talmud#Slavuta Talmud 1795 and Vilna Talmud 1835. Ranges are accepted, eg. 2b-4a
	url = args.url		url = args.url
	nobook = yesno(args[5] or args.nobook)		nobook = yesno(args[5] or args.nobook)

Coolreader18: Simplify + clarify

2023-12-05T04:32:28Z

Simplify + clarify

@@ Line 1: / Line 1: @@
 local talmud = {}
@@ Line 27: / Line 7: @@
 function talmud.generate_citation(frame)
-	local template_args = frame:getParent().args
+	local args = getArgs(frame, { wrappers = 'Template:Cite Talmud' })
 	if not talmud.jb_key[jb] then
-		str = frame:expandTemplate{ title = 'error', args = { 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given ' .. inspect(jb) .. ')' } }
+		return require('Module:Error').error{ 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given "' .. jb .. '")' }
 	end
-    tractate = template_args[2]
+    tractate = args[2]
-    url      = template_args['url']
+    nobook   = yesno(args[5] or args.nobook)
     if not url then
     	url = "https://www.sefaria.org/"
@@ Line 44: / Line 21: @@
     	url = url .. string.gsub(tractate, ' ', '_') .. '.' .. string.gsub(daf or '2a', ' ', '_')
     end
-    if not str then
+ 	if not nobook then
 	end
-	return(str)
+	return str
 end

Waddie96: dited

2019-09-18T13:13:41Z

dited

← Previous revision		Revision as of 13:13, 18 September 2019
Line 46:		Line 46:
	-- str is only set if there has not been an error.		-- str is only set if there has not been an error.
	if not str then		if not str then
	if ~~not~~ nobook == 'yes' then		if nobook == 'yes' then
		⚫	str = '[' .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
			else
	str = '[[Talmud]], <abbr title="' .. talmud.jb_key[jb] .. '">' .. jb .. '.</abbr> ['		str = '[[Talmud]], <abbr title="' .. talmud.jb_key[jb] .. '">' .. jb .. '.</abbr> ['
	str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'		str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
	end
	if nobook == 'yes' then
⚫	st = '[' .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
	end		end
	end		end

Waddie96: added nobook

2019-09-18T13:11:27Z

added nobook

← Previous revision		Revision as of 13:11, 18 September 2019
Line 38:		Line 38:
	daf = template_args[4] -- These are page or folio numbers as described at Talmud#Slavuta Talmud 1795 and Vilna Talmud 1835. Ranges are accepted, eg. 2b-4a		daf = template_args[4] -- These are page or folio numbers as described at Talmud#Slavuta Talmud 1795 and Vilna Talmud 1835. Ranges are accepted, eg. 2b-4a
	url = template_args['url']		url = template_args['url']
			nobook = template_args[5]
	if not url then		if not url then
	url = "https://www.sefaria.org/"		url = "https://www.sefaria.org/"
Line 43:		Line 44:
	url = url .. string.gsub(tractate, ' ', '_') .. '.' .. string.gsub(daf or '2a', ' ', '_')		url = url .. string.gsub(tractate, ' ', '_') .. '.' .. string.gsub(daf or '2a', ' ', '_')
	end		end
	-- str is only set if there has been an error.		-- str is only set if there has not been an error.
	if not str then		if not str then
	str = '[[Talmud]], <abbr title="' .. talmud.jb_key[jb] .. '">' .. jb .. '.</abbr> ['		if not nobook == 'yes' then
			str = '[[Talmud]], <abbr title="' .. talmud.jb_key[jb] .. '">' .. jb .. '.</abbr> ['
	str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'		str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
			end
			if nobook == 'yes' then
			st = '[' .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
			end
	end		end
	return(str)		return(str)

Pppery: Pppery moved page Module:Talmud to Module:Cite Talmud without leaving a redirect: Make module name match template name

2019-05-18T16:02:29Z

Pppery moved page Module:Talmud to Module:Cite Talmud without leaving a redirect: Make module name match template name

← Previous revision	Revision as of 16:02, 18 May 2019
(No difference)

Daask: Fix blanks_to_nil bug and remove debugging code

2019-05-16T15:23:40Z

Fix blanks_to_nil bug and remove debugging code

← Previous revision		Revision as of 15:23, 16 May 2019
Line 1:		Line 1:
	function inspect(str)		function inspect(str)
	str = tostring(str)		str = tostring(str)
	local r = ~~tostring(#str) ..~~ ':"'		local r = '"'
	for i = 1, #str do		for i = 1, #str do
	local c = string.byte(str:sub(i,i))		local c = string.byte(str:sub(i,i))
Line 17:		Line 17:
	for key, val in pairs(template_args) do		for key, val in pairs(template_args) do
	if string.find(string.gsub(val, ' ', ''), '^%s*$') then		if string.find(string.gsub(val, ' ', ''), '^%s*$') then
	template_args[key] = ~~nil~~		template_args[key] = false
	mw.log("Replacing argument " .. inspect(key) .. " which was " .. inspect(val))
	else
	mw.log("Keeping argument " .. inspect(key) .. " which is " .. inspect(val))
	end		end
	end		end
Line 32:		Line 29:
	local template_args = frame:getParent().args		local template_args = frame:getParent().args
	-- local invoke_args = frame.args -- parameters from {{#invoke:}}		-- local invoke_args = frame.args -- parameters from {{#invoke:}}
	mw.log(inspect(template_args[1]))
	blanks_to_nil(template_args)		blanks_to_nil(template_args)
	mw.log(inspect(template_args[1]))
	jb = template_args[1] or 'b'		jb = template_args[1] or 'b'
	if not talmud.jb_key[jb] then		if not talmud.jb_key[jb] then
Line 53:		Line 48:
	str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'		str = str .. url .. ' ' .. tractate .. ' ' .. ( daf or '' ) .. ']'
	end		end
	return str		return(str)
	end		end

Daask: Switch to using mw.log for debugging

2019-05-16T10:02:01Z

Switch to using mw.log for debugging

← Previous revision		Revision as of 10:02, 16 May 2019
Line 1:		Line 1:
	function inspect(str)		function inspect(str)
	~~local r~~ = tostring(#str) ~~.. ':'~~		str = tostring(str)
			local r = tostring(#str) .. ':"'
	for i = 1, #str do		for i = 1, #str do
	local c = string.byte(str:sub(i,i))		local c = string.byte(str:sub(i,i))
Line 9:		Line 10:
	end		end
	end		end
			r = r .. '"'
	return r		return r
	end		end
Line 16:		Line 18:
	if string.find(string.gsub(val, ' ', ''), '^%s*$') then		if string.find(string.gsub(val, ' ', ''), '^%s*$') then
	template_args[key] = nil		template_args[key] = nil
			mw.log("Replacing argument " .. inspect(key) .. " which was " .. inspect(val))
		⚫	else
			mw.log("Keeping argument " .. inspect(key) .. " which is " .. inspect(val))
	end		end
	end		end
Line 27:		Line 32:
	local template_args = frame:getParent().args		local template_args = frame:getParent().args
	-- local invoke_args = frame.args -- parameters from {{#invoke:}}		-- local invoke_args = frame.args -- parameters from {{#invoke:}}
			mw.log(inspect(template_args[1]))
	blanks_to_nil(template_args)		blanks_to_nil(template_args)
			mw.log(inspect(template_args[1]))
	jb = template_args[1] or 'b'		jb = template_args[1] or 'b'
	if not talmud.jb_key[jb] then		if not talmud.jb_key[jb] then
	str = frame:expandTemplate{ title = 'error', args = { 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given "' .. inspect(jb) .. '")' } }		str = frame:expandTemplate{ title = 'error', args = { 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given ' .. inspect(jb) .. ')' } }
	str = str .. '1--' .. inspect(string.gsub(jb, ' ', ''))
	if string.find(string.gsub(jb, ' ', ''), '^%s*$') then
	str = str .. '2--true'
⚫	else
	str = str .. '2--false'
	end
	end		end
	tractate = template_args[2]		tractate = template_args[2]

Daask: Troubleshoot empty space bug

2019-05-15T20:56:17Z

Troubleshoot empty space bug

← Previous revision		Revision as of 20:56, 15 May 2019
Line 1:		Line 1:
	function inspect(str)		function inspect(str)
	local r = ''		local r = tostring(#str) .. ':'
	for i = 1, #str do		for i = 1, #str do
	local c = string.byte(str:sub(i,i))		local c = string.byte(str:sub(i,i))
Line 31:		Line 31:
	if not talmud.jb_key[jb] then		if not talmud.jb_key[jb] then
	str = frame:expandTemplate{ title = 'error', args = { 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given "' .. inspect(jb) .. '")' } }		str = frame:expandTemplate{ title = 'error', args = { 'First argument must be either b for Babylonian Talmud or y for Jerusalem Talmud. (Given "' .. inspect(jb) .. '")' } }
			str = str .. '1--' .. inspect(string.gsub(jb, ' ', ''))
			if string.find(string.gsub(jb, ' ', ''), '^%s*$') then
			str = str .. '2--true'
			else
			str = str .. '2--false'
			end
	end		end
	tractate = template_args[2]		tractate = template_args[2]

Daask: Lua patterns are not RegExps - fix

2019-05-15T19:16:32Z

Lua patterns are not RegExps - fix

← Previous revision		Revision as of 19:16, 15 May 2019
Line 14:		Line 14:
	function blanks_to_nil(template_args)		function blanks_to_nil(template_args)
	for key, val in pairs(template_args) do		for key, val in pairs(template_args) do
	if string.find(val, '~~^(%s\|~~ )*$') then		if string.find(string.gsub(val, ' ', ''), '^%s*$') then
	template_args[key] = nil		template_args[key] = nil
	end		end