Anonymous user
Module:Hatnote list: Difference between revisions
Updated from sandbox: added support for punctuation collapse when text is italicized. The update's content includes changes by users Johnuniq, Dexxor, and Nihiltres.
m (1 revision imported) |
en>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.) |
||
| 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 = | 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 | ||
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 88: | Line 96: | ||
} | } | ||
--Collapses duplicate punctuation | --Collapses duplicate punctuation at end of string, ignoring italics and links | ||
function punctuationCollapse (text) | local function punctuationCollapse (text) | ||
return text:match("[.?!]('?)%1(%]?)%2%.$") and text:sub(1, -2) or text | |||
end | end | ||
| Line 142: | 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 153: | 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 | ||
| Line 171: | Line 170: | ||
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. | 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) | ||