Module:Hatnote list - Revision history

Nihiltres: Updated from sandbox: added support for punctuation collapse when text is italicized. The update's content includes changes by users Johnuniq, Dexxor, and Nihiltres.

2023-11-13T21:00:31Z

Updated from sandbox: added support for punctuation collapse when text is italicized. The update's content includes changes by users Johnuniq, Dexxor, and Nihiltres.

← Previous revision		Revision as of 21:00, 13 November 2023
Line 96:		Line 96:
	}		}

	--Collapses duplicate punctuation		--Collapses duplicate punctuation at end of string, ignoring italics and links
	local function punctuationCollapse (text)		local function punctuationCollapse (text)
			return text:match("[.?!]('?)%1(%]?)%2%.$") and text:sub(1, -2) or text
	local replacements = {
	["%.%.$"] = ".",
	["%?%.$"] = "?",
	["%!%.$"] = "!",
	["%.%]%]%.$"] = ".]]",
	["%?%]%]%.$"] = "?]]",
	["%!%]%]%.$"] = "!]]"
	}
	for k, v in pairs(replacements) do text = string.gsub(text, k, v) end
	return text
	end		end

Line 150:		Line 141:
	-- until the "and"'s stop. Blanks are ignored: "1\|and\|\|and\|3" → {1, 3}		-- until the "and"'s stop. Blanks are ignored: "1\|and\|\|and\|3" → {1, 3}
	while args[i + 2] == options.andKeyword do		while args[i + 2] == options.andKeyword do
	if args[i + 3] then		if args[i + 3] then
	table.insert(forRow.pages, args[i + 3])		table.insert(forRow.pages, args[i + 3])
	end		end
Line 161:		Line 152:
	table.insert(forTable, forRow)		table.insert(forTable, forRow)
	until terminated or i > maxArg		until terminated or i > maxArg


	return forTable		return forTable
	end		end

Nihiltres: Undid revision 1062166786 by Matthiaspaul (talk); should be fixed now, and if not, please ping me with examples as I couldn't reproduce the original error

2021-12-26T20:05:24Z

Undid revision 1062166786 by Matthiaspaul (talk); should be fixed now, and if not, please ping me with examples as I couldn't reproduce the original error

← Previous revision		Revision as of 20:05, 26 December 2021
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
			local mFormatLink = require('Module:Format link')
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
Line 29:		Line 30:
	formatted = false		formatted = false
	}		}

		⚫	--Searches display text only
		⚫	local function searchDisp(haystack, needle)
			return string.find(
		⚫	string.sub(haystack, (string.find(haystack, '\|') or 0) + 1), needle
			)
		⚫	end

	-- Stringifies a list generically; probably shouldn't be used directly		-- Stringifies a list generically; probably shouldn't be used directly
	function stringifyList(list, options)		local function stringifyList(list, options)
	-- Type-checks, defaults, and a shortcut		-- Type-checks, defaults, and a shortcut
	checkType("stringifyList", 1, list, "table")		checkType("stringifyList", 1, list, "table")
Line 42:		Line 50:
	local s = options.space		local s = options.space
	-- Format the list if requested		-- Format the list if requested
	if options.formatted then ~~list = mHatnote.formatPages(unpack(list)) end~~		if options.formatted then
			list = mFormatLink.formatPages(
			{categorizeMissing = mHatnote.missingTargetCat}, list
			)
			end
	-- Set the separator; if any item contains it, use the alternate separator		-- Set the separator; if any item contains it, use the alternate separator
	local separator = options.separator		local separator = options.separator
⚫	--~~searches~~ display text only
⚫	local function searchDisp(t, f)
⚫	~~return string.find(~~string.sub(t, (string.find(t, '\|') or 0) + 1), f)
⚫	end
	for k, v in pairs(list) do		for k, v in pairs(list) do
	if searchDisp(v, separator) then		if searchDisp(v, separator) then
Line 65:		Line 73:

	--DRY function		--DRY function
	function conjList (conj, list, fmt)		function p.conjList (conj, list, fmt)
	return stringifyList(list, {conjunction = conj, formatted = fmt})		return stringifyList(list, {conjunction = conj, formatted = fmt})
	end		end

	-- Stringifies lists with "and" or "or"		-- Stringifies lists with "and" or "or"
	function p.andList (...) return conjList("and", ...) end		function p.andList (...) return p.conjList("and", ...) end
	function p.orList (...) return conjList("or", ...) end		function p.orList (...) return p.conjList("or", ...) end

	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
Line 89:		Line 97:

	--Collapses duplicate punctuation		--Collapses duplicate punctuation
	function punctuationCollapse (text)		local function punctuationCollapse (text)
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",
Line 171:		Line 179:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
			local pagesStr =
⚫	~~local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink{~~link = mHatnote.disambiguate(options.title)}
			p.andList(v.pages, true) or
			mFormatLink._formatLink{
			categorizeMissing = mHatnote.missingTargetCat,
		⚫	link = mHatnote.disambiguate(options.title)
			}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)

Matthiaspaul: Undid revision 1062157581 by Nihiltres (talk) Temp undo as Template:See also now throws errors like "Lua error: bad argument #1 to 'title.new' (number or string expected, got nil)." (for example in article Bronshtein and Semendyayev).

2021-12-26T19:11:47Z

Undid revision 1062157581 by Nihiltres (talk) Temp undo as Template:See also now throws errors like "Lua error: bad argument #1 to 'title.new' (number or string expected, got nil)." (for example in article Bronshtein and Semendyayev).

← Previous revision		Revision as of 19:11, 26 December 2021
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
	local mFormatLink = require('Module:Format link')
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
Line 30:		Line 29:
	formatted = false		formatted = false
	}		}

⚫	--~~Searches~~ display text only
⚫	local function searchDisp(~~haystack~~, ~~needle~~)
	return string.find(
⚫	string.sub(~~haystack~~, (string.find(~~haystack~~, '\|') or 0) + 1), ~~needle~~
	)
⚫	end

	-- Stringifies a list generically; probably shouldn't be used directly		-- Stringifies a list generically; probably shouldn't be used directly
	~~local~~ function stringifyList(list, options)		function stringifyList(list, options)
	-- Type-checks, defaults, and a shortcut		-- Type-checks, defaults, and a shortcut
	checkType("stringifyList", 1, list, "table")		checkType("stringifyList", 1, list, "table")
Line 50:		Line 42:
	local s = options.space		local s = options.space
	-- Format the list if requested		-- Format the list if requested
	if options.formatted then		if options.formatted then list = mHatnote.formatPages(unpack(list)) end
	list = mFormatLink.formatPages(
	{categorizeMissing = mHatnote.missingTargetCat}, list
	)
	end
	-- Set the separator; if any item contains it, use the alternate separator		-- Set the separator; if any item contains it, use the alternate separator
	local separator = options.separator		local separator = options.separator
		⚫	--searches display text only
		⚫	local function searchDisp(t, f)
		⚫	return string.find(string.sub(t, (string.find(t, '\|') or 0) + 1), f)
		⚫	end
	for k, v in pairs(list) do		for k, v in pairs(list) do
	if searchDisp(v, separator) then		if searchDisp(v, separator) then
Line 73:		Line 65:

	--DRY function		--DRY function
	function p.conjList (conj, list, fmt)		function conjList (conj, list, fmt)
	return stringifyList(list, {conjunction = conj, formatted = fmt})		return stringifyList(list, {conjunction = conj, formatted = fmt})
	end		end

	-- Stringifies lists with "and" or "or"		-- Stringifies lists with "and" or "or"
	function p.andList (...) return p.conjList("and", ...) end		function p.andList (...) return conjList("and", ...) end
	function p.orList (...) return p.conjList("or", ...) end		function p.orList (...) return conjList("or", ...) end

	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
Line 97:		Line 89:

	--Collapses duplicate punctuation		--Collapses duplicate punctuation
	~~local~~ function punctuationCollapse (text)		function punctuationCollapse (text)
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",
Line 179:		Line 171:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
		⚫	local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink{link = mHatnote.disambiguate(options.title)}
	local pagesStr =
	p.andList(v.pages, true) or
	mFormatLink._formatLink{
	categorizeMissing = mHatnote.missingTargetCat,
⚫	link = mHatnote.disambiguate(options.title)
	}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)

Nihiltres: Updated from sandbox to use Module:Format link, and export conjList (credit Jackmcbarn), and tag functions local, and extract searchDisp as a nested function

2021-12-26T17:57:33Z

Updated from sandbox to use Module:Format link, and export conjList (credit Jackmcbarn), and tag functions local, and extract searchDisp as a nested function

← Previous revision		Revision as of 17:57, 26 December 2021
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
			local mFormatLink = require('Module:Format link')
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
Line 29:		Line 30:
	formatted = false		formatted = false
	}		}

		⚫	--Searches display text only
		⚫	local function searchDisp(haystack, needle)
			return string.find(
		⚫	string.sub(haystack, (string.find(haystack, '\|') or 0) + 1), needle
			)
		⚫	end

	-- Stringifies a list generically; probably shouldn't be used directly		-- Stringifies a list generically; probably shouldn't be used directly
	function stringifyList(list, options)		local function stringifyList(list, options)
	-- Type-checks, defaults, and a shortcut		-- Type-checks, defaults, and a shortcut
	checkType("stringifyList", 1, list, "table")		checkType("stringifyList", 1, list, "table")
Line 42:		Line 50:
	local s = options.space		local s = options.space
	-- Format the list if requested		-- Format the list if requested
	if options.formatted then ~~list = mHatnote.formatPages(unpack(list)) end~~		if options.formatted then
			list = mFormatLink.formatPages(
			{categorizeMissing = mHatnote.missingTargetCat}, list
			)
			end
	-- Set the separator; if any item contains it, use the alternate separator		-- Set the separator; if any item contains it, use the alternate separator
	local separator = options.separator		local separator = options.separator
⚫	--~~searches~~ display text only
⚫	local function searchDisp(t, f)
⚫	~~return string.find(~~string.sub(t, (string.find(t, '\|') or 0) + 1), f)
⚫	end
	for k, v in pairs(list) do		for k, v in pairs(list) do
	if searchDisp(v, separator) then		if searchDisp(v, separator) then
Line 65:		Line 73:

	--DRY function		--DRY function
	function conjList (conj, list, fmt)		function p.conjList (conj, list, fmt)
	return stringifyList(list, {conjunction = conj, formatted = fmt})		return stringifyList(list, {conjunction = conj, formatted = fmt})
	end		end

	-- Stringifies lists with "and" or "or"		-- Stringifies lists with "and" or "or"
	function p.andList (...) return conjList("and", ...) end		function p.andList (...) return p.conjList("and", ...) end
	function p.orList (...) return conjList("or", ...) end		function p.orList (...) return p.conjList("or", ...) end

	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
Line 89:		Line 97:

	--Collapses duplicate punctuation		--Collapses duplicate punctuation
	function punctuationCollapse (text)		local function punctuationCollapse (text)
	local replacements = {		local replacements = {
	["%.%.$"] = ".",		["%.%.$"] = ".",
Line 171:		Line 179:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
			local pagesStr =
⚫	~~local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink{~~link = mHatnote.disambiguate(options.title)}
			p.andList(v.pages, true) or
			mFormatLink._formatLink{
			categorizeMissing = mHatnote.missingTargetCat,
		⚫	link = mHatnote.disambiguate(options.title)
			}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)

Mr. Stradivarius: switch back to Module:Hatnote instead of Module:Hatnote/sandbox

2020-06-16T15:02:40Z

switch back to Module:Hatnote instead of Module:Hatnote/sandbox

← Previous revision		Revision as of 15:02, 16 June 2020
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
	local mHatnote = require('Module:Hatnote~~/sandbox~~')		local mHatnote = require('Module:Hatnote')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
	local checkType = libraryUtil.checkType		local checkType = libraryUtil.checkType

Mr. Stradivarius: Update with new _formatLink syntax for Module:Hatnote; using the Module:Hatnote/sandbox for now, but will switch back to Module:Hatnote in a short while. Also make "searchDisp" a local variable instead of a global.

2020-06-16T14:57:17Z

Update with new _formatLink syntax for Module:Hatnote; using the Module:Hatnote/sandbox for now, but will switch back to Module:Hatnote in a short while. Also make "searchDisp" a local variable instead of a global.

Galobtter: fix

2018-04-03T05:19:54Z

fix

← Previous revision		Revision as of 05:19, 3 April 2018
Line 177:		Line 177:
	end		end
	end		end
	table.insert(strList, punctuationCollapse(options.extratext..'.'))		if options.extratext then table.insert(strList, punctuationCollapse(options.extratext..'.')) end
	-- Return the concatenated list		-- Return the concatenated list
	return table.concat(strList, ' ')		return table.concat(strList, ' ')

Galobtter: add "." and collapse punctuation for extratext

2018-04-03T05:16:55Z

add "." and collapse punctuation for extratext

← Previous revision		Revision as of 05:16, 3 April 2018
Line 177:		Line 177:
	end		end
	end		end
	table.insert(strList, options.extratext)		table.insert(strList, punctuationCollapse(options.extratext..'.'))
	-- Return the concatenated list		-- Return the concatenated list
	return table.concat(strList, ' ')		return table.concat(strList, ' ')

Galobtter: add "extratext" functionality to "ForSee" to allow text to be added after it

2018-03-31T10:18:42Z

add "extratext" functionality to "ForSee" to allow text to be added after it

← Previous revision		Revision as of 10:18, 31 March 2018
Line 85:		Line 85:
	title = mw.title.getCurrentTitle().text,		title = mw.title.getCurrentTitle().text,
	otherText = 'other uses',		otherText = 'other uses',
	forSeeForm = 'For %s, see %s.'		forSeeForm = 'For %s, see %s.',
	}		}

Line 125:		Line 125:
	local i = from		local i = from
	local terminated = false		local terminated = false
			-- If there is extra text, and no arguments are given, give nil value
			-- to not produce default of "For other uses, see foo (disambiguation)"
			if options.extratext and i > maxArg then return nil end
	-- Loop to generate rows		-- Loop to generate rows
	repeat		repeat
Line 157:		Line 160:
	function p.forSeeTableToString (forSeeTable, options)		function p.forSeeTableToString (forSeeTable, options)
	-- Type-checks and defaults		-- Type-checks and defaults
	checkType("forSeeTableToString", 1, forSeeTable, "table")		checkType("forSeeTableToString", 1, forSeeTable, "table", true)
	checkType("forSeeTableToString", 2, options, "table", true)		checkType("forSeeTableToString", 2, options, "table", true)
	options = options or {}		options = options or {}
Line 165:		Line 168:
	-- Stringify each for-see item into a list		-- Stringify each for-see item into a list
	local strList = {}		local strList = {}
	for k, v in pairs(forSeeTable) do		if forSeeTable then
			for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
	local pagesStr = p.andList(v.pages, true) or		local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink(mHatnote.disambiguate(options.title))
			local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	mHatnote._formatLink(mHatnote.disambiguate(options.title))
	~~local~~ forSeeStr = ~~string.format~~(~~options.forSeeForm, useStr, pagesStr~~)		forSeeStr = punctuationCollapse(forSeeStr)
	~~forSeeStr~~ ~~= punctuationCollapse(~~forSeeStr)		table.insert(strList, forSeeStr)
			end
⚫	table.insert(strList, ~~forSeeStr~~)
	end		end
		⚫	table.insert(strList, options.extratext)
	-- Return the concatenated list		-- Return the concatenated list
	return table.concat(strList, ' ')		return table.concat(strList, ' ')

Nihiltres: Updated from sandbox

2016-06-25T06:18:53Z

Updated from sandbox

Show changes

← Previous revision		Revision as of 14:57, 16 June 2020
Line 9:		Line 9:

	local mArguments --initialize lazily		local mArguments --initialize lazily
	local mHatnote = require('Module:Hatnote')		local mHatnote = require('Module:Hatnote/sandbox')
	local libraryUtil = require('libraryUtil')		local libraryUtil = require('libraryUtil')
	local checkType = libraryUtil.checkType		local checkType = libraryUtil.checkType
Line 46:		Line 46:
	local separator = options.separator		local separator = options.separator
	--searches display text only		--searches display text only
	function searchDisp(t, f)		local function searchDisp(t, f)
	return string.find(string.sub(t, (string.find(t, '\|') or 0) + 1), f)		return string.find(string.sub(t, (string.find(t, '\|') or 0) + 1), f)
	end		end
Line 171:		Line 171:
	for k, v in pairs(forSeeTable) do		for k, v in pairs(forSeeTable) do
	local useStr = v.use or options.otherText		local useStr = v.use or options.otherText
	local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink(mHatnote.disambiguate(options.title))		local pagesStr = p.andList(v.pages, true) or mHatnote._formatLink{link = mHatnote.disambiguate(options.title)}
	local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)		local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
	forSeeStr = punctuationCollapse(forSeeStr)		forSeeStr = punctuationCollapse(forSeeStr)