Changes

Module:Citation/CS1 (başlanğıc kodu nəzərdən keçir)

03:45, 18 iyun 2021 versiyası

8.525 bayt əlavə edildi , 03:45, 18 iyun 2021

Nəzərə çarpan dəyişiklik yoxdur.

Sətir 1: Sətir 1: −

−

~~local cs1 ={};~~

--[[--------------------------< F O R W A R D D E C L A R A T I O N S >--------------------------------------

Sətir 9: Sətir 7:

local is_set, in_array, substitute, error_comment, set_error, select_one, -- functions in Module:Citation/CS1/Utilities

−

add_maint_cat, wrap_style, safe_for_italics, is_wikilink, make_wikilink;

+

add_maint_cat, wrap_style, safe_for_italics, is_wikilink, make_wikilink,

+

strip_apostrophe_markup;

local z ={}; -- tables in Module:Citation/CS1/Utilities

Sətir 69: Sətir 68:

local function add_prop_cat (key, arguments)

−

~~--[[ отключено для рувики~~

if not added_prop_cats [key] then

added_prop_cats [key] = true; -- note that we've added this category

key = key:gsub ('(foreign_lang_source_?2?)%a%a%a?', '%1'); -- strip lang code from keyname

−

table.insert( z.properties_cats, substitute (cfg.prop_cats [key], arguments)); -- make name then add to table

+

table.insert( z.properties_cats, substitute (cfg.prop_cats [key], arguments)); -- make name then add to table

end

−

]]

end

Sətir 135: Sətir 132:

the first character of the whole domain name including subdomains must be a letter or a digit

internationalized domain name (ascii characters with .xn-- ASCII Compatible Encoding (ACE) prefix xn-- in the tld) see https://tools.ietf.org/html/rfc3490

−

single-letter/digit second-level domains in the .org and .~~cash~~ TLDs

+

single-letter/digit second-level domains in the .org, .cash, and .today TLDs

q, x, and z SL domains in the .com TLD

i and q SL domains in the .net TLD

Sətir 154: Sətir 151:

domain = domain:gsub ('^//', ''); -- strip '//' from domain name if present; done here so we only have to do it once

−

if not domain:match ('^[%~~a%d~~]') then -- first character must be letter or digit

+

if not domain:match ('^[%w]') then -- first character must be letter or digit

return false;

end

−

~~-- Do most common case first~~

+

−

if domain:match ('~~%f[%a%d][%a%d][%a%d%-]+[%a%d]%.%a%a+$') then -- three or more character hostname.hostname or hostname.tld~~

+

if domain:match ('^%a+:') then -- hack to detect things that look like s:Page:Title where Page: is namespace at wikisource

−

~~return true;~~

−

~~elseif domain:match ('%f[~~%a~~%d][%a%d][%a%d%-]~~+~~[%a%d]%.xn%-%-[%a%d]+$') then -- internationalized domain name with ACE prefix~~

−

~~return true;~~

−

~~elseif domain:match ('%f[%a%d][%a%d]%.cash$') then -- one character/digit .cash hostname~~

−

~~return true;~~

−

~~elseif domain:match ('%f[%a%d][%a%d]%.org$') then -- one character/digit .org hostname~~

−

~~return true;~~

−

~~elseif domain:match ('%f[%a][qxz]%.com$') then -- assigned one character .com hostname (x.com times out 2015-12-10)~~

−

~~return true;~~

−

~~elseif domain~~:~~match ('%f[%a][iq]%.net$~~') then -- ~~assigned one character .net hostname (q.net registered but not active 2015-12-10)~~

−

~~return true;~~

−

~~elseif domain~~:~~match ('%f[%a%d][%a%d]%.%a%a$') then -- one character hostname and cctld (2 chars)~~

−

~~return true;~~

−

~~elseif domain~~:~~match ('%f[%a%d][%a%d][%a%d]%.%a%a+$') then -- two character hostname and tld~~

−

~~return true;~~

−

~~elseif domain~~:~~match ('^%d%d?%d?%.%d%d?%d?%.%d%d?%d?%.%d%d?%d?') then -- IPv4 address~~

−

~~return true;~~

−

~~else~~

return false;

end

+

local patterns = { -- patterns that look like urls

+

'%f[%w][%w][%w%-]+[%w]%.%a%a+$', -- three or more character hostname.hostname or hostname.tld

+

'%f[%w][%w][%w%-]+[%w]%.xn%-%-[%w]+$', -- internationalized domain name with ACE prefix

+

'%f[%a][qxz]%.com$', -- assigned one character .com hostname (x.com times out 2015-12-10)

+

'%f[%a][iq]%.net$', -- assigned one character .net hostname (q.net registered but not active 2015-12-10)

+

'%f[%w][%w]%.%a%a$', -- one character hostname and cctld (2 chars)

+

'%f[%w][%w][%w]%.%a%a+$', -- two character hostname and tld

+

'^%d%d?%d?%.%d%d?%d?%.%d%d?%d?%.%d%d?%d?', -- IPv4 address

+

}

+

for _, pattern in ipairs (patterns) do -- loop through the patterns list

+

if domain:match (pattern) then

+

return true; -- if a match then we think that this thing that purports to be a url is a url

+

end

+

end

+

for _, d in ipairs ({'cash', 'company', 'today', 'org'}) do -- look for single letter second level domain names for these top level domains

+

if domain:match ('%f[%w][%w]%.' .. d) then

+

return true

+

end

+

end

+

return false; -- no matches, we don't know what this thing is

end

Sətir 365: Sətir 367:

error_message=error_message .. "|" .. k .. "="; -- add the failed parameter

end

−

~~end~~

−

~~if is_set (error_message) then -- done looping, if there is an error message, display it~~

−

~~table.insert( z.message_tail, { set_error( 'param_has_ext_link', {error_message}, true ) } );~~

end

Sətir 380: Sətir 379:

local function safe_for_url( str )

if str:match( "%[%[.-%]%]" ) ~= nil then

−

~~table.insert( z.message_tail, { set_error( 'wikilink_in_url', {}, true ) } );~~

end

Sətir 401: Sətir 399:

local path;

local base_url;

−

+

if not is_set( label ) then

label = URL;

Sətir 421: Sətir 419:

base_url = table.concat({ "[", URL, " ", safe_for_url (label), "]" }); -- assemble a wikimarkup url

−

+

if is_set (access) then -- access level (subscription, registration, limited)

base_url = substitute (cfg.presentation['ext-link-access-signal'], {cfg.presentation[access].class, cfg.presentation[access].title, base_url}); -- add the appropriate icon

Sətir 443: Sətir 441:

if not added_deprecated_cat then

added_deprecated_cat = true; -- note that we've added this category

−

~~table.insert( z.message_tail, { set_error( 'deprecated_params', {name}, true ) } ); -- add error message~~

end

Sətir 525: Sətir 522:

is not added. At this time there is no error message for this condition.

−

Supports |script-title= ~~and~~ |script-chapter=

+

Supports |script-title=, |script-chapter=, |script-<periodical>=

−

~~TODO: error messages when prefix is invalid ISO639-1 code; when script_value has prefix but no script;~~

]]

−

local function format_script_value (script_value)

+

local function format_script_value (script_value, script_param)

local lang=''; -- initialize to empty string

local name;

Sətir 536: Sətir 532:

lang = script_value:match('^(%l%l)%s*:%s*%S.*'); -- get the language prefix or nil if there is no script

if not is_set (lang) then

+

table.insert( z.message_tail, { set_error( 'script_parameter', {script_param, 'missing title part'}, true ) } ); -- prefix without 'title'; add error message

return ''; -- script_value was just the prefix so return empty string

end

Sətir 543: Sətir 540:

script_value = script_value:gsub ('^%l%l%s*:%s*', ''); -- strip prefix from script

-- is prefix one of these language codes?

−

~~if in_array (lang, cfg.script_lang_codes) then~~

−

~~add_prop_cat ('script_with_name', {name, lang})~~

−

~~else~~

−

~~add_prop_cat ('script')~~

−

~~end~~

lang = ' lang="' .. lang .. '" '; -- convert prefix into a lang attribute

else

+

table.insert( z.message_tail, { set_error( 'script_parameter', {script_param, 'invalid language code'}, true ) } ); -- invalid language code; add error message

lang = ''; -- invalid so set lang to empty string

end

+

else

+

table.insert( z.message_tail, { set_error( 'script_parameter', {script_param, 'missing prefix'}, true ) } ); -- no language code prefix; add error message

end

script_value = substitute (cfg.presentation['bdi'], {lang, script_value}); -- isolate in case script is rtl

Sətir 565: Sətir 560:

]]

−

local function script_concatenate (title, script)

+

local function script_concatenate (title, script, script_param)

if is_set (script) then

−

script = format_script_value (script); -- <bdi> tags, lang atribute, categorization, etc; returns empty string on error

+

script = format_script_value (script, script_param); -- <bdi> tags, lang atribute, categorization, etc; returns empty string on error

if is_set (script) then

title = title .. ' ' .. script; -- concatenate title and script title

Sətir 591: Sətir 586:

local msg;

msg = cfg.messages[key]:lower(); -- set the message to lower case before

−

return substitute( msg, str ); -- including template text

+

return substitute( msg, str ); -- including template text

else

return substitute( cfg.messages[key], str );

Sətir 598: Sətir 593: −

--[[--------------------------< F O R ~~M A T _~~ C ~~H A P T~~ E R _ ~~T I T L~~ E >--------------------------------------

+

--[[--------------------------< W I K I S O U R C E _ U R L _ M A K E >----------------------------------------

+

makes a wikisource url from wikisource interwiki link. returns the url and appropriate label; nil else.

−

~~Format~~ the ~~four chapter parameters:~~ |~~script-~~chapter=, |~~chapter~~=, |~~trans~~-~~chapter~~=~~, and |chapter-url= into a single Chapter meta-~~

+

str is the value assigned to |chapter= (or aliases) or |title= or |title-link=

−

~~parameter (chapter_url_source used for error messages).~~

]]

−

local function format_chapter_title (scriptchapter, chapter, transchapter, chapterurl, chapter_url_source, no_quotes, access)

+

local function wikisource_url_make (str)

−

local chapter_error = '';

+

local wl_type, D, L;

−

+

local ws_url, ws_label;

+

wl_type, D, L = is_wikilink (str); -- wl_type is 0 (not a wikilink), 1 (simple wikilink), 2 (complex wikilink)

+

if 0 == wl_type then -- not a wikilink; might be from |title-link=

+

str = D:match ('^[Ww]ikisource:(.+)') or D:match ('^[Ss]:(.+)'); -- article title from interwiki link with long-form or short-form namespace

+

if is_set (str) then

+

ws_url = table.concat ({ -- build a wikisource url

+

'https://en.wikisource.org/wiki/', -- prefix

+

str, -- article title

+

});

+

ws_label = str; -- label for the url

+

end

+

elseif 1 == wl_type then -- simple wikilink: [[Wikisource:ws article]]

+

str = D:match ('^[Ww]ikisource:(.+)') or D:match ('^[Ss]:(.+)'); -- article title from interwiki link with long-form or short-form namespace

+

if is_set (str) then

+

ws_url = table.concat ({ -- build a wikisource url

+

'https://en.wikisource.org/wiki/', -- prefix

+

str, -- article title

+

});

+

ws_label = str; -- label for the url

+

end

+

elseif 2 == wl_type then -- non-so-simple wikilink: [[Wikisource:ws article|displayed text]] ([[L|D]])

+

str = L:match ('^[Ww]ikisource:(.+)') or L:match ('^[Ss]:(.+)'); -- article title from interwiki link with long-form or short-form namespace

+

if is_set (str) then

+

ws_label = D; -- get ws article name from display portion of interwiki link

+

ws_url = table.concat ({ -- build a wikisource url

+

'https://en.wikisource.org/wiki/', -- prefix

+

str, -- article title without namespace from link portion of wikilink

+

});

+

end

+

end

+

if ws_url then

+

ws_url = mw.uri.encode (ws_url, 'WIKI'); -- make a usable url

+

ws_url = ws_url:gsub ('%%23', '#'); -- undo percent encoding of anchor

+

end

+

return ws_url, ws_label, L or D; -- return proper url or nil and a label or nil

+

end

+

--[[--------------------------< F O R M A T _ P E R I O D I C A L >--------------------------------------------

+

Format the four periodical parameters: |script-<periodical>=, |<periodical>=, and |trans-<periodical>= into a single Periodical meta-

+

parameter.

+

]]

+

local function format_periodical (script_periodical, script_periodical_source, periodical, trans_periodical)

+

local periodical_error = '';

+

if not is_set (periodical) then

+

periodical = ''; -- to be safe for concatenation

+

else

+

periodical = wrap_style ('italic-title', periodical); -- style

+

end

+

periodical = script_concatenate (periodical, script_periodical, script_periodical_source); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

+

if is_set (trans_periodical) then

+

trans_periodical = wrap_style ('trans-italic-title', trans_periodical);

+

if is_set (periodical) then

+

periodical = periodical .. ' ' .. trans_periodical;

+

else -- here when transchapter without chapter or script-chapter

+

periodical = trans_periodical;

+

periodical_error = ' ' .. set_error ('trans_missing_title', {'periodical'});

+

end

+

end

+

return periodical .. periodical_error;

+

end

+

--[[--------------------------< F O R M A T _ C H A P T E R _ T I T L E >--------------------------------------

+

Format the four chapter parameters: |script-chapter=, |chapter=, |trans-chapter=, and |chapter-url= into a single Chapter meta-

+

parameter (chapter_url_source used for error messages).

+

]]

+

local function format_chapter_title (scriptchapter, script_chapter_source, chapter, transchapter, chapterurl, chapter_url_source, no_quotes, access)

+

local chapter_error = '';

+

local ws_url, ws_label, L = wikisource_url_make (chapter); -- make a wikisource url and label from a wikisource interwiki link

+

if ws_url then

+

ws_label = ws_label:gsub ('_', ''); -- replace underscore separaters with space characters

+

chapter = ws_label;

+

end

+

if not is_set (chapter) then

chapter = ''; -- to be safe for concatenation

Sətir 617: Sətir 702:

end

−

chapter = script_concatenate (chapter, scriptchapter) -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

+

chapter = script_concatenate (chapter, scriptchapter, script_chapter_source); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

if is_set (chapterurl) then

−

chapter = external_link (chapterurl, chapter, chapter_url_source, access); -- adds bare_url_missing_title error if appropriate

+

chapter = external_link (chapterurl, chapter, chapter_url_source, access); -- adds bare_url_missing_title error if appropriate

+

elseif ws_url then

+

chapter = external_link (ws_url, chapter .. ' ', 'ws link in chapter'); -- adds bare_url_missing_title error if appropriate; space char to move icon away from chap text; TODO: better way to do this?

+

chapter = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], L, chapter});

end

Sətir 628: Sətir 716:

chapter = chapter .. ' ' .. transchapter;

else -- here when transchapter without chapter or script-chapter

−

chapter = transchapter; --

+

chapter = transchapter;

chapter_error = ' ' .. set_error ('trans_missing_title', {'chapter'});

end

Sətir 634: Sətir 722:

-- if is_set (chapterurl) then

−

-- chapter = external_link (chapterurl, chapter, chapter_url_source, access); -- adds bare_url_missing_title error if appropriate

+

-- chapter = external_link (chapterurl, chapter, chapter_url_source, access); -- adds bare_url_missing_title error if appropriate

-- end

Sətir 650: Sətir 738:

Detects but ignores nowiki and math stripmarkers. Also detects other named stripmarkers (gallery, math, pre, ref)

and identifies them with a slightly different error message. See also coins_cleanup().

−

~~Detects but ignores the character pattern that results from the transclusion of {{'}} templates.~~

Output of this function is an error message that identifies the character or the Unicode group, or the stripmarker

Sətir 691: Sətir 777:

local err_msg;

if capture then

−

err_msg = capture .. ' ' .. char; ~~-- для рувики: TODO: не согласуется?~~

+

err_msg = capture .. ' ' .. char;

else

−

err_msg = '~~Символ~~' .. ' ' ~~.. char~~; ~~-- для рувики~~

+

err_msg = char .. ' ' .. 'character';

end

Sətir 739: Sətir 825:

-- maybe let through instead of raising an error?

-- v, origin[k] = args[k], k;

−

error( cfg.messages[''] );

+

error( cfg.messages['unknown_argument_map'] .. ': ' .. k);

end

Sətir 824: Sətir 910:

return str; -- nothing to do, we're done

end

+

str = str:gsub ('&[nm]dash;', {['–'] = '–', ['—'] = '—'}); -- replace — and – entities with their characters; semicolon mucks up the text.split

local out = {};

Sətir 836: Sətir 924:

item:match ('%a+%s*%-%s*%a+') then -- letter hyphen letter

item = item:gsub ('(%w*[%.%-]?%w+)%s*%-%s*(%w*[%.%-]?%w+)', '%1–%2'); -- replace hyphen, remove extraneous space characters

−

else ~~-- для рувики: всё наоборот~~

+

else

−

item = mw.ustring.gsub (item, '%s*[–—]%s*', '—'); -- for endash or emdash separated ranges, replace em with en, remove extraneous white space

+

item = mw.ustring.gsub (item, '%s*[–—]%s*', '–'); -- for endash or emdash separated ranges, replace em with en, remove extraneous white space

end

Sətir 976: Sətir 1.064:

local function is_good_vanc_name (last, first)

−

local first, suffix = first:match ('(.-),?%s*([%dJS][%drndth]+)%.?$') or first; -- if first has something that looks like a generational suffix, get it

+

local first, suffix = first:match ('(.-),?%s*([%dJS][%drndth]+)%.?$') or first; -- if first has something that looks like a generational suffix, get it

if is_set (suffix) then

Sətir 1.117: Sətir 1.205:

if count > 0 then

if count > 1 and is_set(lastauthoramp) and not etal then

−

text[#text-2] = " & "; -- replace last separator with ampersand text

+

text[#text-2] = ", "; -- replace last separator with ampersand text

end

text[#text] = nil; -- erase the last separator

Sətir 1.156: Sətir 1.244:

--[[--------------------------< N A M E _ H A S _ E T A L >----------------------------------------------------

−

Evaluates the content of author ~~and~~ editor ~~name parameters~~ for variations on the theme of et al. If found,

+

Evaluates the content of name parameters (author, editor, etc) for variations on the theme of et al. If found,

the et al. is removed, a flag is set to true and the function returns the modified name and the flag.

This function never sets the flag to false but returns it's previous state because it may have been set by

−

previous passes through this function or by the ~~parameters~~ |display-~~authors=etal or |display-editors~~=etal

+

previous passes through this function or by the associated |display-<names>=etal parameter

]]

−

local function name_has_etal (name, etal, nocat)

+

local function name_has_etal (name, etal, nocat, param)

if is_set (name) then -- name can be nil in which case just return

−

local ~~etal_pattern~~ = ~~"[;,]? *[\"']*%f[%a][Ee][Tt] *[Aa][Ll][%~~.~~\"']*$" -- variations on the 'et al' theme~~

+

local patterns = cfg.et_al_patterns; --get patterns from configuration

−

~~local others_pattern = "[~~;~~,]? *%f[%a]and [Oo]thers";~~ -- ~~and alternate to et al.~~

−

~~if name:match~~ (~~etal_pattern~~) ~~then -- variants on et al.~~

+

for _, pattern in ipairs (patterns) do -- loop through all of the patterns

−

~~name = name:gsub (etal_pattern, ''); -- if found, remove~~

+

if name:match (pattern) then -- if this 'et al' pattern is found in name

−

~~etal = true; -~~- ~~set flag (may have been set previously here or by |display~~-~~authors=etal)~~

+

name = name:gsub (pattern, ''); -- remove the offending text

−

if ~~not nocat then -- no categorization for |vauthors=~~

+

etal = true; -- set flag (may have been set previously here or by |display-<names>=etal)

−

~~add_maint_cat ('etal'); -- and add a category if not already added~~

+

if not nocat then -- no categorization for |vauthors=

−

~~end~~

+

table.insert( z.message_tail, {set_error ('etal', {param})}); -- and set an error if not added

−

~~elseif~~ name:match (~~others_pattern~~) then -- if ~~not~~ 'et al.'~~, then 'and others'?~~

+

end

−

name = name:gsub (~~others_pattern~~, ''); -- ~~if found,~~ remove

−

etal = true; -- set flag (may have been set previously here or by |display-~~authors~~=etal)

−

if not nocat then -- no categorization for |vauthors=

−

~~add_maint_cat~~ ('etal'); -- and ~~add a category~~ if not ~~already~~ added

end

+

return name, etal; --

end

Sətir 1.198: Sətir 1.282:

local function name_has_ed_markup (name, list_name)

local _, pattern;

−

local patterns = ~~{ -- these patterns match annotations at end of name~~

+

local patterns = cfg.editor_markup_patterns; -- get patterns from configuration

−

~~'%f[%(%[][%(%[]%s*[Ee][Dd][Ss]?%~~.~~?%s*[%)%]]?$', -- (ed) or (eds): leading '(', case insensitive 'ed', optional 's', '.' and/or ')'~~

−

~~'[,%.%s]%f[e]eds?%.?$', -- ed or eds: without '('or ')'~~; ~~case sensitive (ED could be initials Ed could be name)~~

−

~~'%f[%(%[][%(%[]%s*[Ee][Dd][Ii][Tt][Oo][Rr][Ss]?%.?%s*[%)%]]?$', -- (editor) or (editors): leading '(', case insensitive, optional '.' and/or ')'~~

−

~~'[,%.%s]%f[Ee][Ee][Dd][Ii][Tt][Oo][Rr][Ss]?%.?$', -- editor or editors: without '('or ')'; case insensitive~~

−

-- ~~these~~ patterns ~~match annotations at beginning of name~~

−

~~'^eds?[%.,;]', -- ed. or eds.: lower case only, optional 's', requires '.'~~

−

~~'^[%(%[]%s*[Ee][Dd][Ss]?%.?%s*[%)%]]', -- (ed) or (eds): also sqare brackets, case insensitive, optional 's', '.'~~

−

~~'^[%(%[]?%s*[Ee][Dd][Ii][Tt][Oo][Rr][Ss]?%A', -- (editor or (editors: also sq brackets, case insensitive, optional brackets, 's'~~

−

~~'^[%(%[]?%s*[Ee][Dd][Ii][Tt][Ee][Dd]%A', -- (edited: also sq brackets, case insensitive, optional brackets~~

−

}

if is_set (name) then

Sətir 1.235: Sətir 1.308:

if is_set (name) then

_, count = name:gsub ('[;,]', ''); -- count the number of separator-like characters

−

~~if 1 < count then -- param could be |author= or |editor= so one separator character is acceptable~~

−

~~add_maint_cat ('mult_names', cfg.special_case_translation [list_name]); -- more than one separator indicates multiple names so add a maint cat for this template~~

−

~~end~~

end

return name; -- and done

Sətir 1.297: Sətir 1.366:

local etal=false; -- return value set to true when we find some form of et al. in an author parameter

−

local ~~err_msg_list_name = list_name:match ("(%w+)List") .. 's list'~~; -- ~~modify AuthorList or EditorList for use~~ in error ~~messages if necessary~~

+

local last_alias, first_alias; -- selected parameter aliases used in error messaging

while true do

−

last = select_one( args, cfg.aliases[list_name .. '-Last'], 'redundant_parameters', i ); -- search through args for name components beginning at 1

+

last, last_alias = select_one( args, cfg.aliases[list_name .. '-Last'], 'redundant_parameters', i ); -- search through args for name components beginning at 1

−

first = select_one( args, cfg.aliases[list_name .. '-First'], 'redundant_parameters', i );

+

first, first_alias = select_one( args, cfg.aliases[list_name .. '-First'], 'redundant_parameters', i );

link = select_one( args, cfg.aliases[list_name .. '-Link'], 'redundant_parameters', i );

mask = select_one( args, cfg.aliases[list_name .. '-Mask'], 'redundant_parameters', i );

−

last, etal = name_has_etal (last, etal, false); -- find and remove variations on et al.

+

last, etal = name_has_etal (last, etal, false, last_alias); -- find and remove variations on et al.

−

first, etal = name_has_etal (first, etal, false); -- find and remove variations on et al.

+

first, etal = name_has_etal (first, etal, false, first_alias); -- find and remove variations on et al.

last, first= name_checks (last, first, list_name); -- multiple names, extraneous annotation, etc checks

if first and not last then -- if there is a firstn without a matching lastn

−

table.insert( z.message_tail, { set_error( 'first_missing_last', {~~err_msg_list_name~~, i}, true ) } ); -- add this error message

+

table.insert( z.message_tail, { set_error( 'first_missing_last', {first_alias, first_alias:gsub('first', 'last')}, true ) } ); -- add this error message

elseif not first and not last then -- if both firstn and lastn aren't found, are we done?

count = count + 1; -- number of times we haven't found last and first

Sətir 1.321: Sətir 1.390:

n = n + 1; -- point to next location in the names table

if 1 == count then -- if the previous name was missing

−

table.insert( z.message_tail, { set_error( 'missing_name', {~~err_msg_list_name~~, i-1}, true ) } ); -- add this error message

+

table.insert( z.message_tail, { set_error( 'missing_name', {list_name:match ("(%w+)List"):lower(), i-1}, true ) } ); -- add this error message

end

count = 0; -- reset the counter, we're looking for two consecutive missing names

Sətir 1.344: Sətir 1.413:

extensions. For example, code 'cbk-zam' and its associated name 'Chavacano de Zamboanga' (MediaWiki does not support

code 'cbk' or name 'Chavacano'. Most (all?) of these languages are not used a 'language' codes per se, rather they

−

are used as sub-domain names: cbk-zam.wikipedia.org. ~~These~~ names can be found ~~(for the time being)~~ at

+

are used as sub-domain names: cbk-zam.wikipedia.org. A list of language names and codes supported by fetchLanguageNames()

−

~~https~~://~~phabricator.wikimedia.org/diffusion/ECLD/browse/master/LocalNames/LocalNamesEn.php~~

+

can be found at Template:Citation Style documentation/language/doc

−

Names ~~but~~ that are included in the list will be found if that name is provided in the |language= parameter. For example,

+

Names that are included in the list will be found if that name is provided in the |language= parameter. For example,

if |language=Chavacano de Zamboanga, that name will be found with the associated code 'cbk-zam'. When names are found

−

and the associated code is not two or three characters, this function returns only the ~~Wikimedia~~ language name.

+

and the associated code is not two or three characters, this function returns only the WikiMedia language name.

+

Some language names have multiple entries under different codes:

+

Aromanian has code rup and code roa-rup

+

When this occurs, this function returns the language name and the 2- or 3-character code

Adapted from code taken from Module:Check ISO 639-1.

Sətir 1.360: Sətir 1.433:

end

+

local ietf_code; -- because some languages have both ietf-like codes and iso 639-like codes

+

local ietf_name;

+

local languages = mw.language.fetchLanguageNames(this_wiki_code, 'all') -- get a list of language names known to Wikimedia

-- ('all' is required for North Ndebele, South Ndebele, and Ojibwa)

local langlc = mw.ustring.lower(lang); -- lower case version for comparisons

−

+

for code, name in pairs(languages) do -- scan the list to see if we can find our language

if langlc == mw.ustring.lower(name) then

−

if 2 ~= code:len() ~~and~~ 3 ~= code:len() then -- two- or three-character codes only; extensions not supported

+

if 2 == code:len() or 3 == code:len() then -- two- or three-character codes only; extensions not supported

−

return name; -- so return the name ~~but not~~ the code

+

return name, code; -- so return the name and the code

end

−

~~return name,~~ code; -- found ~~it, return~~ name ~~to ensure proper capitalization and the the~~ code

+

ietf_code = code; -- remember that we found an ietf-like code and save its name

+

ietf_name = name; -- but keep looking for a 2- or 3-char code

end

−

return lang; -- ~~not valid language~~; return language ~~in original case and nil for the code~~

+

-- didn't find name with 2- or 3-char code; if ietf-like code found return

+

return ietf_code and ietf_name or lang; -- associated name; return original language text else

end

Sətir 1.406: Sətir 1.484:

for _, lang in ipairs (names_table) do -- reuse lang

+

name = cfg.lang_code_remap[lang:lower()]; -- first see if this is a code that is not supported by MediaWiki but is in remap

−

if lang:match ('^%a%a%-') then -- strip ietf ~~language~~ tags from code; TODO: is there a need to support 3-char with tag?

+

if name then -- there was a remapped code so

−

lang = lang:match ('(%a%a)%-') -- keep only 639-1 code portion to lang; TODO: do something with 3166 alpha 2 country code?

+

lang = lang:gsub ('^(%a%a%a?)%-.*', '%1'); -- strip ietf tags from code

−

~~end~~

+

else

−

+

if lang:match ('^%a%a%-') then -- strip ietf tags from code; TODO: is there a need to support 3-char with tag?

−

~~-- костыль для рувики: замена распространённых англоназваний на коды~~

+

lang = lang:match ('(%a%a)%-') -- keep only 639-1 code portion to lang; TODO: do something with 3166 alpha 2 country code?

−

~~local fromEnglishToCode = {~~

−

~~['Arabic'] = 'ar',~~

−

~~['Azerbaijani'] = 'az',~~

−

~~['Belarusian'] = 'be',~~

−

~~['Bulgarian'] = 'bg',~~

−

~~['Czech'] = 'cs',~~

−

~~['Danish'] = 'da',~~

−

~~['German'] = 'de',~~

−

~~['Greek'] = 'el',~~

−

~~['Spanish'] = 'es',~~

−

~~['English'] = 'en',~~

−

~~['Finnish'] = 'fi',~~

−

~~['French'] = 'fr',~~

−

~~['Hebrew'] = 'he',~~

−

~~['Croatian'] = 'hr',~~

−

~~['Hungarian'] = 'hu',~~

−

~~['Armenian'] = 'hy',~~

−

~~['Indonesian'] = 'id',~~

−

~~['Italian'] = 'it',~~

−

~~['Japanese'] = 'ja',~~

−

~~['Korean'] = 'ko',~~

−

~~['Latin'] = 'la',~~

−

~~['Dutch'] = 'nl',~~

−

~~['Norwegian'] = 'no',~~

−

~~['Polish'] = 'pl',~~

−

~~['Portuguese'] = 'pt',~~

−

~~['Romanian'] = 'ro',~~

−

~~['Russian'] = 'ru',~~

−

~~['Slovenian'] = 'sl',~~

−

~~['Serbian'] = 'sr',~~

−

~~['Swedish'] = 'sv',~~

−

~~['Thai'] = 'th',~~

−

~~['Turkish'] = 'tr',~~

−

~~['Ukrainian'] = 'uk',~~

−

~~['Chinese'] = 'zh',~~

−

}

−

~~if fromEnglishToCode[lang] then~~

−

~~lang = fromEnglishToCode[lang]~~

−

~~end~~

−

~~if 2 == lang:len() or 3 == lang:len() then -- if two-or three-character code~~

−

~~-- для рувики: замена полного названия на сокращение вроде фр. или англ.~~

−

~~name = mw.getCurrentFrame():expandTemplate{~~

−

~~title='lg',~~

−

~~args={lang}~~

−

}

−

~~if name == '' then~~

−

~~name = nil~~

−

~~end~~

−

~~if not is_set (name) then~~

−

~~name = mw.language.fetchLanguageName( lang:lower(), this_wiki_code); -- get language name if |language= is a proper code~~

end

−

+

if 2 == lang:len() or 3 == lang:len() then -- if two-or three-character code

−

if ~~not is_set~~ (~~name~~) then

+

name = mw.language.fetchLanguageName (lang:lower(), this_wiki_code); -- get language name if |language= is a proper code

−

name = ~~cfg~~.~~lang_code_remap[~~lang]; -- ~~not supported by MediaWiki;~~ is ~~it in remap?~~

end

−

+

if is_set (name) then -- if |language= specified a valid code

code = lang:lower(); -- save it

Sətir 1.477: Sətir 1.504:

if is_set (code) then -- only 2- or 3-character codes

−

name = cfg.lang_code_remap[code] or name; -- override wikimedia when they misuse language codes/names

+

name = cfg.lang_code_remap[code] or name; -- override wikimedia when they misuse language codes/names -- add maint category if not already added

−

~~if this_wiki_code ~= code then -- when the language is not the same as this wiki's language~~

−

~~if 2 == code:len() then -- and is a two-character code~~

−

~~add_prop_cat ('foreign_lang_source' .. code, {name, code}) -- categorize it~~

−

~~else -- or is a recognized language (but has a three-character code)~~

−

~~add_prop_cat ('foreign_lang_source_2' .. code, {code}) -- categorize it differently TODO: support mutliple three-character code categories per cs1|2 template~~

−

~~end~~

−

~~end~~

−

~~else~~

−

~~add_maint_cat ('unknown_lang');~~ -- add maint category if not already added

end

Sətir 1.496: Sətir 1.513:

code = #language_list -- reuse code as number of languages in the list

if 2 >= code then

−

name = table.concat (language_list, ' ~~and~~ ') -- insert '<space>and<space>' between two language names

+

name = table.concat (language_list, cfg.messages['parameter-pair-separator']) -- insert '<space>and<space>' between two language names

elseif 2 < code then

−

language_list~~[code] =~~ '~~and~~ ' ~~.. language_list[code]~~; -- ~~prepend last name~~ with '~~and~~<space>'

+

name = table.concat (language_list, ', '); -- and concatenate with '<comma><space>' separators

−

name = ~~table.concat~~ (~~language_list~~, ', ') -- ~~and concatenate~~ with '<comma><space>' ~~separators~~

+

name = name:gsub (', ([^,]+)$', cfg.messages['parameter-final-separator'] .. '%1'); -- replace last '<comma><space>' separator with '<comma><space>and<space>' separator

end

if this_wiki_name == name then

Sətir 1.601: Sətir 1.618:

local function is_pdf (url)

−

return url:match ('%.pdf$') or url:match ('%.PDF$') or url:match ('%.pdf[%?#]') or url:match ('%.PDF[%?#]');

+

return url:match ('%.pdf$') or url:match ('%.PDF$') or

+

url:match ('%.pdf[%?#]') or url:match ('%.PDF[%?#]') or

+

url:match ('%.PDF&#035') or url:match ('%.pdf&#035');

end

Sətir 1.629: Sətir 1.648: −

--[[--------------------------< G E T _ D I S P L A Y _ A ~~U T H O R S _~~ E ~~D I T O R~~ S >------------------------

+

--[[--------------------------< G E T _ D I S P L A Y _ N A M E S >--------------------------------------------

Returns a number that defines the number of names displayed for author and editor name lists and a boolean flag

Sətir 1.652: Sətir 1.671:

]]

−

local function ~~get_display_authors_editors~~ (max, count, list_name, etal)

+

local function get_display_names (max, count, list_name, etal)

if is_set (max) then

if 'etal' == max:lower():gsub("[ '%.]", '') then -- the :gsub() portion makes 'etal' from a variety of 'et al.' spellings and stylings

Sətir 1.659: Sətir 1.678:

elseif max:match ('^%d+$') then -- if is a string of numbers

max = tonumber (max); -- make it a number

−

~~if max >= count then -- if |display-xxxxors= value greater than or equal to number of authors/editors~~

−

~~add_maint_cat ('disp_auth_ed', cfg.special_case_translation [list_name]);~~

−

~~end~~

else -- not a valid keyword or number

table.insert( z.message_tail, { set_error( 'invalid_param_val', {'display-' .. list_name, max}, true ) } ); -- add error message

Sətir 1.686: Sətir 1.702:

local good_pattern = '^P[^%.Pp]'; -- ok to begin with uppercase P: P7 (pg 7 of section P) but not p123 (page 123) TODO: add Gg for PG or Pg?

local bad_pattern = '^[Pp]?[Pp]%.?[ %d]';

−

~~if not page:match (good_pattern) and (page:match (bad_pattern) or page:match ('^[Pp]ages?')) then~~

−

~~add_maint_cat ('extra_text');~~

−

~~end~~

end

Sətir 1.761: Sətir 1.773:

vparam, etal = name_has_etal (vparam, etal, true); -- find and remove variations on et al. do not categorize (do it here because et al. might have a period)

−

v_name_table = get_v_name_table (vparam, v_name_table, v_link_table); -- names are separated by commas

+

v_name_table = get_v_name_table (vparam, v_name_table, v_link_table); -- names are separated by commas

for i, v_name in ipairs(v_name_table) do

Sətir 1.873: Sətir 1.885:

if not is_set (value) then

return true; -- an empty parameter is ok

−

elseif in_array(value~~:lower()~~, possible) then

+

elseif in_array (value, possible) then

return true;

else

Sətir 1.924: Sətir 1.936:

end

−

local vol = '';

+

local vol = ''; -- here for all cites except magazine

if is_set (volume) then

−

if (4 < mw.ustring.len(volume)) then

+

if volume:match ('^[MDCLXVI]+$') or volume:match ('^%d+$')then -- volume value is all digits or all uppercase roman numerals

−

vol = substitute (cfg.messages['j-vol'], {sepc, volume});

+

vol = substitute (cfg.presentation['vol-bold'], {sepc, hyphen_to_dash(volume)}); -- render in bold face

−

else

+

elseif (4 < mw.ustring.len(volume)) then -- not all digits or roman numerals and longer than 4 characters

−

vol = substitute (cfg.presentation['vol-bold'], {sepc, hyphen_to_dash(volume)});

+

vol = substitute (cfg.messages['j-vol'], {sepc, volume}); -- not bold

+

else -- four or less characters

+

vol = substitute (cfg.presentation['vol-bold'], {sepc, hyphen_to_dash(volume)}); -- bold

end

Sətir 1.977: Sətir 1.991:

return substitute (cfg.messages['nopp'], {sepc, page}), '', '', '';

end

−

~~elseif~~ is_set(pages) then

+

end

+

if is_set(pages) then

if is_journal then

return substitute (cfg.messages['j-page(s)'], pages), '', '', '';

−

elseif tonumber(pages) ~= nil and not nopp then -- if pages is only digits, assume a single page number

+

elseif tonumber(pages) ~= nil and not nopp then -- if pages is only digits, assume a single page number

−

return '', substitute (cfg.messages['p-~~prefix~~'], {sepc, pages}), '', '';

+

return '', substitute (cfg.messages['pp-suffix'], {sepc, pages}), '', '';

elseif not nopp then

−

return '', substitute (cfg.messages['pp-~~prefix~~'], {sepc, pages}), '', '';

+

return '', substitute (cfg.messages['pp-suffix'], {sepc, pages}), '', '';

else

return '', substitute (cfg.messages['nopp'], {sepc, pages}), '', '';

Sətir 1.993: Sətir 2.008: −

--[=[-------------------------< A R C ~~H I V~~ E _ ~~U R~~ L _ ~~C H~~ E ~~C K~~ >--------------------------------------------

+

--[[--------------------------< I N S O U R C E _ L O C _ G E T >----------------------------------------------

−

~~Check archive.org urls to make sure they at least look like they are pointing at valid archives and not to~~ the

+

returns one of the in-source locators: page, pages, or at.

−

~~save snapshot url or to calendar~~ pages~~. When the archive url is 'https://web.archive.org/save/' (~~or ~~http://...)~~

−

~~archive.org saves a snapshot of the target page in the url. That is something that Wikipedia should not allow~~

−

~~unwitting readers to do~~.

−

When the archive.org url does not have a complete timestamp, archive.org chooses a snapshot according to its own

+

If any of these are interwiki links to wikisource, returns the label portion of the interwikilink as plain text

−

algorithm or provides a calendar 'search' result. [[WP:ELNO]] discourages links to search results.

+

for use in COinS. This COinS thing is done because here we convert an interwiki link to and external link and

+

add an icon span around that; get_coins_pages() doesn't know about the span. TODO: should it?

+

TODO: add support for sheet and sheets?; streamline;

+

TODO: make it so that this function returns only one of the three as the single in-source (the return value assigned

+

to a new name)?

+

]]

+

local function insource_loc_get (page, pages, at)

+

local ws_url, ws_label, coins_pages, L; -- for wikisource interwikilinks; TODO: this corrupts page metadata (span remains in place after cleanup; fix there?)

+

if is_set (page) then

+

if is_set (pages) or is_set(at) then

+

pages = ''; -- unset the others

+

at = '';

+

end

+

extra_text_in_page_check (page); -- add this page to maint cat if |page= value begins with what looks like p. or pp.

+

ws_url, ws_label, L = wikisource_url_make (page); -- make ws url from |page= interwiki link; link portion L becomes tool tip label

+

if ws_url then

+

page = external_link (ws_url, ws_label .. ' ', 'ws link in page'); -- space char after label to move icon away from in-source text; TODO: a better way to do this?

+

page = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], L, page});

+

coins_pages = ws_label;

+

end

+

elseif is_set (pages) then

+

if is_set (at) then

+

at = ''; -- unset

+

end

+

extra_text_in_page_check (pages); -- add this page to maint cat if |pages= value begins with what looks like p. or pp.

+

ws_url, ws_label, L = wikisource_url_make (pages); -- make ws url from |pages= interwiki link; link portion L becomes tool tip label

+

if ws_url then

+

pages = external_link (ws_url, ws_label .. ' ', 'ws link in pages'); -- space char after label to move icon away from in-source text; TODO: a better way to do this?

+

pages = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], L, pages});

+

coins_pages = ws_label;

+

end

+

elseif is_set (at) then

+

ws_url, ws_label, L = wikisource_url_make (at); -- make ws url from |at= interwiki link; link portion L becomes tool tip label

+

if ws_url then

+

at = external_link (ws_url, ws_label .. ' ', 'ws link in at'); -- space char after label to move icon away from in-source text; TODO: a better way to do this?

+

at = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], L, at});

+

coins_pages = ws_label;

+

end

+

end

+

return page, pages, at, coins_pages;

+

end

+

--[=[-------------------------< A R C H I V E _ U R L _ C H E C K >--------------------------------------------

+

Check archive.org urls to make sure they at least look like they are pointing at valid archives and not to the

+

save snapshot url or to calendar pages. When the archive url is 'https://web.archive.org/save/' (or http://...)

+

archive.org saves a snapshot of the target page in the url. That is something that Wikipedia should not allow

+

unwitting readers to do.

+

When the archive.org url does not have a complete timestamp, archive.org chooses a snapshot according to its own

+

algorithm or provides a calendar 'search' result. [[WP:ELNO]] discourages links to search results.

This function looks at the value assigned to |archive-url= and returns empty strings for |archive-url= and

Sətir 2.040: Sətir 2.112:

err_msg = 'liveweb';

else

−

path, timestamp, flag = url:match('//web%.archive%.org/([^%d]*)(%d+)([^/]*)/'); -- split out some of the url parts for evaluation

+

path, timestamp, flag = url:match('//web%.archive%.org/([^%d]*)(%d+)([^/]*)/'); -- split out some of the url parts for evaluation

if not is_set(timestamp) or 14 ~= timestamp:len() then -- path and flag optional, must have 14-digit timestamp here

Sətir 2.105: Sətir 2.177:

elseif 3 == selected then

Authors = A['Authors']; -- use content of |authors=

−

~~if 'authors' == A:ORIGIN('Authors') then -- but add a maint cat if the parameter is |authors=~~

−

~~add_maint_cat ('authors'); -- because use of this parameter is discouraged; what to do about the aliases is a TODO:~~

−

~~end~~

end

if is_set (Collaboration) then

Sətir 2.114: Sətir 2.183:

end

−

~~local Coauthors = A['Coauthors']; -- для рувики (а вообще депрекированный)~~

local Others = A['Others'];

Sətir 2.130: Sətir 2.198:

elseif 3 == selected then

Editors = A['Editors']; -- use content of |editors=

−

~~add_maint_cat ('editors'); -- but add a maint cat because use of this parameter is discouraged~~

end

+

local translator_etal;

local t = {}; -- translators list from |translator-lastn= / translator-firstn= pairs

local Translators; -- assembled translators name list

t = extract_names (args, 'TranslatorList'); -- fetch translator list from |translatorn= / |translator-lastn=, -firstn=, -linkn=, -maskn=

−

local interviewers_list = {};

+

local interviewer_etal;

−

local Interviewers ~~= A['Interviewers']~~

+

local interviewers_list = {};

−

~~if is_set (Interviewers) then~~ -- ~~add a maint cat if the |interviewers= is~~ used

+

local Interviewers; -- used later

−

~~add_maint_cat ('interviewers'); -- because use of this parameter is discouraged~~

+

interviewers_list = extract_names (args, 'InterviewerList'); -- process preferred interviewers parameters

−

~~else~~

−

interviewers_list = extract_names (args, 'InterviewerList'); -- ~~else,~~ process preferred interviewers parameters

−

~~end~~

+

local contributor_etal;

local c = {}; -- contributors list from |contributor-lastn= / contributor-firstn= pairs

local Contributors; -- assembled contributors name list

Sətir 2.169: Sətir 2.235:

end

−

if not is_valid_parameter_value (NameListFormat, 'name-list-format', cfg.keywords['name-list-format']) then -- only accepted value for this parameter is 'vanc'

+

if not is_valid_parameter_value (NameListFormat, 'name-list-format', cfg.keywords['name-list-format']) then -- only accepted value for this parameter is 'vanc'

NameListFormat = ''; -- anything else, set to empty string

end

Sətir 2.190: Sətir 2.256:

local Chapter = A['Chapter'];

local ScriptChapter = A['ScriptChapter'];

+

local ScriptChapterOrigin = A:ORIGIN ('ScriptChapter');

local ChapterLink -- = A['ChapterLink']; -- deprecated as a parameter but still used internally by cite episode

local TransChapter = A['TransChapter'];

Sətir 2.202: Sətir 2.269:

ArchiveURL, ArchiveDate = archive_url_check (A['ArchiveURL'], A['ArchiveDate'])

−

local ~~DeadURL~~ = A['~~DeadURL~~']

+

local UrlStatus = A['UrlStatus'];

−

if not is_valid_parameter_value (~~DeadURL~~, '~~dead~~-~~url~~', cfg.keywords ['~~deadurl~~']) then -- set in config.defaults to '~~yes~~'

+

if 'url-status' == A:ORIGIN ('UrlStatus') then -- interim: TODO: this line goes away

−

~~DeadURL~~ = ''; -- anything else, set to empty string

+

if not is_valid_parameter_value (UrlStatus, 'url-status', cfg.keywords ['url-status']) then -- set in config.defaults to 'dead'

−

end

+

UrlStatus = ''; -- anything else, set to empty string

−

+

end -- interim: TODO: this line goes away

+

elseif is_set (A:ORIGIN ('UrlStatus')) then -- interim: while both |dead-url= and |url-status= allowed use separate keyword lists; TODO: remove this section

+

if not is_valid_parameter_value (UrlStatus, A:ORIGIN ('UrlStatus'), cfg.keywords ['deadurl']) then -- interim: assume |dead-url=; use those keywords; TODO: this line goes away

+

UrlStatus = ''; -- anything else, set to empty string; interim: TODO: this line goes away

+

end -- interim: TODO: this line goes away

+

end -- interim: TODO: this line goes away

+

if in_array (UrlStatus, {'yes', 'true', 'y'}) then -- TODO: remove this whole thing when |dead-url=[yes|no] parameters removed from articles

+

UrlStatus = 'dead';

+

elseif 'no' == UrlStatus then

+

UrlStatus = 'live';

+

end

+

local URL = A['URL']

local URLorigin = A:ORIGIN('URL'); -- get name of parameter that holds URL

Sətir 2.215: Sətir 2.294:

local ConferenceURLorigin = A:ORIGIN('ConferenceURL'); -- get name of parameter that holds ConferenceURL

local Periodical = A['Periodical'];

−

local Periodical_origin = A:ORIGIN('Periodical'); -- get the name of the periodical parameter

+

local Periodical_origin = '';

+

if is_set (Periodical) then

+

Periodical_origin = A:ORIGIN('Periodical'); -- get the name of the periodical parameter

+

local i;

+

Periodical, i = strip_apostrophe_markup (Periodical); -- strip appostrophe markup so that metadata isn't contaminated

+

if i then -- non-zero when markup was stripped so emit an error message

+

table.insert( z.message_tail, {set_error ('apostrophe_markup', {Periodical_origin}, true)});

+

end

+

end

+

local ScriptPeriodical = A['ScriptPeriodical'];

+

local ScriptPeriodical_origin = A:ORIGIN('ScriptPeriodical');

+

-- web and news not tested for now because of

+

-- Wikipedia:Administrators%27_noticeboard#Is_there_a_semi-automated_tool_that_could_fix_these_annoying_"Cite_Web"_errors?

+

local TransPeriodical = A['TransPeriodical'];

local Series = A['Series'];

Sətir 2.225: Sətir 2.319:

local At;

−

if in_array (config.CitationClass, cfg.templates_using_volume) then

+

if 'citation' == config.CitationClass then

+

if is_set (Periodical) then

+

if not in_array (Periodical_origin, {'website', 'mailinglist'}) then -- {{citation}} does not render volume for these 'periodicals'

+

Volume = A['Volume']; -- but does for all other 'periodicals'

+

end

+

elseif is_set (ScriptPeriodical) then

+

if 'script-website' ~= ScriptPeriodical_origin then -- {{citation}} does not render volume for |script-website=

+

Volume = A['Volume']; -- but does for all other 'periodicals'

+

end

+

else

+

Volume = A['Volume']; -- and does for non-'periodical' cites

+

end

+

elseif in_array (config.CitationClass, cfg.templates_using_volume) then -- render |volume= for cs1 according to the configuration settings

Volume = A['Volume'];

+

end

+

if 'citation' == config.CitationClass then

+

if is_set (Periodical) and in_array (Periodical_origin, {'journal', 'magazine', 'newspaper', 'periodical', 'work'}) or -- {{citation}} renders issue for these 'periodicals'

+

is_set (ScriptPeriodical) and in_array (ScriptPeriodical_origin, {'script-journal', 'script-magazine', 'script-newspaper', 'script-periodical', 'script-work'}) then -- and these 'script-periodicals'

+

Issue = hyphen_to_dash (A['Issue']);

+

end

+

elseif in_array (config.CitationClass, cfg.templates_using_issue) then -- conference & map books do not support issue; {{citation}} listed here because included in settings table

+

if not (in_array (config.CitationClass, {'conference', 'map', 'citation'}) and not (is_set (Periodical) or is_set (ScriptPeriodical))) then

+

Issue = hyphen_to_dash (A['Issue']);

+

end

−

~~-- conference & map books do not support issue~~

+

−

~~if in_array (config.CitationClass, cfg.templates_using_issue) and not (in_array (config.CitationClass, {'conference', 'map'}) and not is_set (Periodical))then~~

−

~~Issue = hyphen_to_dash (A['Issue']);~~

−

~~end~~

local Position = '';

if not in_array (config.CitationClass, cfg.templates_not_using_page) then

Sətir 2.244: Sətir 2.358:

local PublisherName = A['PublisherName'];

+

local PublisherName_origin = A:ORIGIN('PublisherName');

+

if is_set (PublisherName) then

+

local i=0;

+

PublisherName, i = strip_apostrophe_markup (PublisherName); -- strip appostrophe markup so that metadata isn't contaminated; publisher is never italicized

+

if i then -- non-zero when markup was stripped so emit an error message

+

table.insert( z.message_tail, {set_error ('apostrophe_markup', {PublisherName_origin}, true)});

+

end

+

end

+

local RegistrationRequired = A['RegistrationRequired'];

if not is_valid_parameter_value (RegistrationRequired, 'registration', cfg.keywords ['yes_true_y']) then

Sətir 2.262: Sətir 2.386:

table.insert( z.message_tail, { set_error( 'param_access_requires_param', {'url'}, true ) } );

end

−

+

if is_set (UrlAccess) and is_set (SubscriptionRequired) then -- while not aliases, these are much the same so if both are set

table.insert( z.message_tail, { set_error( 'redundant_parameters', {wrap_style ('parameter', 'url-access') .. ' and ' .. wrap_style ('parameter', 'subscription')}, true ) } ); -- add error message

Sətir 2.273: Sətir 2.397:

local ChapterUrlAccess = A['ChapterUrlAccess'];

−

if not is_valid_parameter_value (ChapterUrlAccess, '~~chapter-url-access~~', cfg.keywords ['url-access']) then -- same as url-access

+

if not is_valid_parameter_value (ChapterUrlAccess, A:ORIGIN('ChapterUrlAccess'), cfg.keywords ['url-access']) then -- same as url-access

ChapterUrlAccess = nil;

end

if not is_set(ChapterURL) and is_set(ChapterUrlAccess) then

ChapterUrlAccess = nil;

−

table.insert( z.message_tail, { set_error( 'param_access_requires_param', {'~~chapter~~-url'}, true ) } );

+

table.insert( z.message_tail, { set_error( 'param_access_requires_param', {A:ORIGIN('ChapterUrlAccess'):gsub ('%-access', '')}, true ) } );

+

end

+

local MapUrlAccess = A['MapUrlAccess'];

+

if not is_valid_parameter_value (MapUrlAccess, 'map-url-access', cfg.keywords ['url-access']) then

+

MapUrlAccess = nil;

+

end

+

if not is_set(A['MapURL']) and is_set(MapUrlAccess) then

+

MapUrlAccess = nil;

+

table.insert( z.message_tail, { set_error( 'param_access_requires_param', {'map-url'}, true ) } );

end

Sətir 2.299: Sətir 2.432:

local ID_list = extract_ids( args );

+

if is_set (DoiBroken) and not ID_list['DOI'] then

+

table.insert( z.message_tail, { set_error( 'doibroken_missing_doi', A:ORIGIN('DoiBroken'))});

+

end

local ID_access_levels = extract_id_access_levels( args, ID_list );

Sətir 2.330: Sətir 2.466:

if not is_valid_parameter_value (DF, 'df', cfg.keywords['date-format']) then -- validate reformatting keyword

DF = ''; -- not valid, set to empty string

+

end

+

if not is_set (DF) then

+

DF = cfg.global_df;

end

−

local sepc; -- separator between citation elements for CS1 a period, for CS2, a comma

+

local sepc; -- separator between citation elements for CS1 a period, for CS2, a comma

local PostScript;

local Ref;

sepc, PostScript, Ref = set_style (Mode:lower(), A['PostScript'], A['Ref'], config.CitationClass);

−

use_lowercase = ( sepc == ',' ); -- used to control capitalization for certain static text

+

use_lowercase = ( sepc == ',' ); -- used to control capitalization for certain static text

--check this page to see if it is in one of the namespaces that cs1 is not supposed to add to the error categories

Sətir 2.352: Sətir 2.491:

-- check for extra |page=, |pages= or |at= parameters. (also sheet and sheets while we're at it)

−

select_one( args, {'page', 'p~~', 'pp', 'pages~~', 'at', 'sheet', 'sheets'}, 'redundant_parameters' ); -- this is a dummy call simply to get the error message and category

+

select_one( args, {'page', 'p', 'at', 'sheet', 'sheets'}, 'redundant_parameters' ); -- this is a dummy call simply to get the error message and category

+

local coins_pages;

+

Page, Pages, At, coins_pages = insource_loc_get (Page, Pages, At);

local NoPP = A['NoPP']

Sətir 2.361: Sətir 2.504:

end

−

if is_set(~~Page~~) ~~then~~

+

if not is_set(PublicationPlace) and is_set(Place) then -- both |publication-place= and |place= (|location=) allowed if different

−

if is_set(~~Pages) or is_set(At) then~~

+

PublicationPlace = Place; -- promote |place= (|location=) to |publication-place

−

~~Pages = ''; -- unset the others~~

−

~~At = '';~~

−

~~end~~

−

~~extra_text_in_page_check (Page); -- add this page to maint cat if |page= value begins with what looks like p. or pp.~~

−

~~elseif is_set(Pages) then~~

−

~~if is_set(At~~) then

−

~~At = ''; -- unset~~

−

~~end~~

−

~~extra_text_in_page_check (Pages); -- add this page to maint cat if |pages= value begins with what looks like p. or pp.~~

−

~~end~~

−

-- both |publication-place= and |place= (|location=) allowed if different

−

~~if not is_set(PublicationPlace) and is_set(Place) then~~

−

PublicationPlace = Place; -- promote |place= (|location=) to |publication-place

end

−

if PublicationPlace == Place then Place = ''; end -- don't need both if they are the same

+

if PublicationPlace == Place then Place = ''; end -- don't need both if they are the same

--[[

Sətir 2.386: Sətir 2.515:

|encyclopedia and |article then map |encyclopedia to |title

−

~~|encyclopedia then map |encyclopedia to |title~~

+

−

|trans-title maps to |trans-chapter when |title is re-mapped

|url maps to |chapterurl when |title is remapped

Sətir 2.398: Sətir 2.526:

if ( config.CitationClass == "encyclopaedia" ) or ( config.CitationClass == "citation" and is_set (Encyclopedia)) then -- test code for citation

−

if is_set(Periodical) then -- Periodical is set when |encyclopedia is set

+

if is_set (Periodical) then -- Periodical is set when |encyclopedia is set

if is_set(Title) or is_set (ScriptTitle) then

if not is_set(Chapter) then

ScriptChapter = ScriptTitle;

+

ScriptChapterOrigin = 'title';

TransChapter = TransTitle;

ChapterURL = URL;

Sətir 2.419: Sətir 2.548:

ScriptTitle = '';

end

−

~~else~~ -- |title not set

+

elseif is_set (Chapter) then -- |title not set

−

Title = Periodical; -- |encyclopedia set and |article ~~set or not~~ set so map |encyclopedia to |title

+

Title = Periodical; -- |encyclopedia set and |article set so map |encyclopedia to |title

Periodical = ''; -- redundant so unset

end

Sətir 2.440: Sətir 2.569:

if (config.CitationClass == "mailinglist") then

Periodical = A ['MailingList'];

−

elseif 'mailinglist' == ~~A:ORIGIN('Periodical')~~ then

+

elseif 'mailinglist' == Periodical_origin then

Periodical = ''; -- unset because mailing list is only used for cite mailing list

end

Sətir 2.463: Sətir 2.592:

elseif 'speech' ~= config.CitationClass then

Conference = ''; -- not cite conference or cite speech so make sure this is empty string

−

~~end~~

−

~~-- для рувики: конкатенация |month к |date~~

−

~~local Month = A['Month'];~~

−

~~if is_set(Month) and is_set(Year) then~~

−

~~Date = Month .. " " .. Year;~~

−

~~Month = nil;~~

−

~~Year = nil;~~

end

Sətir 2.481: Sətir 2.602:

Chapter = A['Map'];

ChapterURL = A['MapURL'];

−

ChapterUrlAccess = ~~UrlAccess~~;

+

ChapterUrlAccess = MapUrlAccess;

TransChapter = A['TransMap'];

ChapterURLorigin = A:ORIGIN('MapURL');

Sətir 2.525: Sətir 2.646:

-- assemble a table of parts concatenated later into Series

if is_set(Season) then table.insert(s, wrap_msg ('season', Season, use_lowercase)); end

−

if is_set(SeriesNumber) then table.insert(s, wrap_msg ('~~series~~', SeriesNumber, use_lowercase)); end

+

if is_set(SeriesNumber) then table.insert(s, wrap_msg ('seriesnum', SeriesNumber, use_lowercase)); end

if is_set(Issue) then table.insert(s, wrap_msg ('episode', Issue, use_lowercase)); end

Issue = ''; -- unset because this is not a unique parameter

Sətir 2.531: Sətir 2.652:

Chapter = Title; -- promote title parameters to chapter

ScriptChapter = ScriptTitle;

+

ScriptChapterOrigin = 'title';

ChapterLink = TitleLink; -- alias episodelink

TransChapter = TransTitle;

Sətir 2.561: Sətir 2.683:

-- end of {{cite episode}} stuff

−

-- Account for the oddities that are {{cite arxiv}}, {{cite biorxiv}}, {{cite citeseerx}}, before generation of COinS data.

+

-- Account for the oddities that are {{cite arxiv}}, {{cite biorxiv}}, {{cite citeseerx}}, {{cite ssrn}}, before generation of COinS data.

do

−

if in_array (config.CitationClass, {'arxiv', 'biorxiv', 'citeseerx'}) then

+

if in_array (config.CitationClass, {'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) then

if not is_set (ID_list[config.CitationClass:upper()]) then -- |arxiv= or |eprint= required for cite arxiv; |biorxiv= & |citeseerx= required for their templates

−

table.insert( z.message_tail, { set_error( config.CitationClass .. '_missing', {}, true ) } ); -- add error message

+

table.insert( z.message_tail, { set_error( config.CitationClass .. '_missing', {}, true ) } ); -- add error message

−

~~end~~

−

~~if 'arxiv' == config.CitationClass then~~

−

~~Periodical = 'arXiv'; -- set to arXiv for COinS; after that, must be set to empty string~~

end

−

if '~~biorxiv~~' =~~= config.CitationClass then~~

+

Periodical = ({['arxiv'] = 'arXiv', ['biorxiv'] = bioRxiv, ['citeseerx'] = 'CiteSeerX', ['ssrn'] = 'Social Science Research Network'})[config.CitationClass];

−

~~Periodical =~~ '~~bioRxiv~~'~~; -- set to~~ bioRxiv ~~for COinS; after that~~, ~~must be set to empty string~~

+

end

−

~~end~~

−

if 'citeseerx' == config.CitationClass ~~then~~

−

~~Periodical = 'CiteSeerX'; -- set to CiteSeerX for COinS~~; ~~after that, must be set to empty string~~

−

~~end~~

−

end

Sətir 2.635: Sətir 2.747:

anchor_year, Embargo, error_message = dates(date_parameters_list, COinS_date);

−

~~-- start temporary Julian / Gregorian calendar uncertainty categorization~~

−

~~if COinS_date.inter_cal_cat then~~

−

~~add_prop_cat ('jul_greg_uncertainty');~~

−

~~end~~

-- end temporary Julian / Gregorian calendar uncertainty categorization

Sətir 2.648: Sətir 2.756:

end

error_message = error_message .. '|year= / |date= mismatch';

−

~~elseif 1 == mismatch then -- |year= matches year-value in |date=~~

−

~~add_maint_cat ('date_year');~~

end

Sətir 2.662: Sətir 2.768:

if true == date_hyphen_to_dash (date_parameters_list) then -- convert hyphens to dashes where appropriate

modified = true;

−

~~add_maint_cat ('date_format'); -- hyphens were converted so add maint category~~

end

Sətir 2.680: Sətir 2.785:

PublicationDate = date_parameters_list['publication-date'].val;

end

−

~~else~~

−

~~table.insert( z.message_tail, { set_error( 'bad_date', {error_message}, true ) } ); -- add this error message~~

end

end -- end of do

Sətir 2.695: Sətir 2.798:

if is_set(AccessDate) then -- access date requires |url=; pmc created url is not |url=

table.insert( z.message_tail, { set_error( 'accessdate_missing_url', {}, true ) } );

−

AccessDate = ''; ~~-- для рувики: TODO: убрать?~~ -- unset

+

AccessDate = ''; -- unset

end

Sətir 2.706: Sətir 2.809:

not is_set(TransTitle) and

not is_set(ScriptTitle) then

−

if 'episode' == config.CitationClass then ~~-- special case for cite episode; TODO: is there a better way to do this?~~

+

if 'episode' == config.CitationClass then

−

~~table.insert( z.message_tail, { set_error( 'citation_missing_title', {'series'}, true ) } );~~

−

~~else~~

−

~~table.insert( z.message_tail, { set_error( 'citation_missing_title', {'title'}, true ) } );~~

end

−

+

−

if 'none' == Title and in_array (config.CitationClass, {'journal', 'citation'}) and is_set (Periodical) and 'journal' == ~~A:ORIGIN(~~'~~Periodical~~') then -- special case for journal cites

+

if 'none' == Title and

−

Title = ''; -- set title to empty string

+

in_array (config.CitationClass, {'journal', 'citation'}) and

−

~~add_maint_cat ('untitled');~~

+

(is_set (Periodical) or is_set (ScriptPeriodical)) and

+

('journal' == Periodical_origin or 'script-journal' == ScriptPeriodical_origin) then -- special case for journal cites

+

Title = ''; -- set title to empty string

end

−

check_for_url ({ -- add error message when any of these parameters ~~contains~~ a URL

+

check_for_url ({ -- add error message when any of these parameters hold a URL

['title']=Title,

[A:ORIGIN('Chapter')]=Chapter,

−

[~~A:ORIGIN('Periodical')~~]=Periodical,

+

[Periodical_origin] = Periodical,

−

[~~A:ORIGIN('PublisherName')~~] = PublisherName

+

[PublisherName_origin] = PublisherName

});

Sətir 2.745: Sətir 2.847:

-- this is the function call to COinS()

local OCinSoutput = COinS({

−

['Periodical'] = Periodical,

+

['Periodical'] = strip_apostrophe_markup (Periodical), -- no markup in the metadata

−

['Encyclopedia'] = Encyclopedia,

+

['Encyclopedia'] = strip_apostrophe_markup (Encyclopedia),

['Chapter'] = make_coins_title (coins_chapter, ScriptChapter), -- Chapter and ScriptChapter stripped of bold / italic wikimarkup

['Degree'] = Degree; -- cite thesis only

Sətir 2.757: Sətir 2.859:

['Volume'] = Volume,

['Issue'] = Issue,

−

['Pages'] = get_coins_pages (first_set ({Sheet, Sheets, Page, Pages, At}, 5)), -- pages stripped of external links

+

['Pages'] = coins_pages or get_coins_pages (first_set ({Sheet, Sheets, Page, Pages, At}, 5)), -- pages stripped of external links

['Edition'] = Edition,

−

['PublisherName'] = PublisherName,

+

['PublisherName'] = PublisherName, -- any apostrophe markup already removed

['URL'] = first_set ({ChapterURL, URL}, 2),

['Authors'] = coins_author,

Sətir 2.766: Sətir 2.868:

}, config.CitationClass);

−

-- Account for the oddities that are {{cite arxiv}}, {{cite biorxiv}}, and {{cite ~~citeseerx~~}} AFTER generation of COinS data.

+

-- Account for the oddities that are {{cite arxiv}}, {{cite biorxiv}}, {{cite citeseerx}}, and {{cite ssrn}} AFTER generation of COinS data.

−

if in_array (config.CitationClass, {'arxiv', 'biorxiv', 'citeseerx'}) then -- we have set rft.jtitle in COinS to arXiv, bioRxiv, or ~~CiteSeerX~~ now unset so it isn't displayed

+

if in_array (config.CitationClass, {'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) then -- we have set rft.jtitle in COinS to arXiv, bioRxiv, CiteSeerX, or ssrn now unset so it isn't displayed

Periodical = ''; -- periodical not allowed in these templates; if article has been published, use cite journal

end

Sətir 2.774: Sətir 2.876:

if 'newsgroup' == config.CitationClass then

if is_set (PublisherName) then

−

PublisherName = substitute (cfg.messages['newsgroup'], external_link( 'news:' .. PublisherName, PublisherName, ~~A:ORIGIN('PublisherName')~~, nil ));

+

PublisherName = substitute (cfg.messages['newsgroup'], external_link( 'news:' .. PublisherName, PublisherName, PublisherName_origin, nil ));

end

−

-- Now perform various field substitutions.

Sətir 2.795: Sətir 2.895:

do -- do editor name list first because the now unsupported coauthors used to modify control table

−

control.maximum , editor_etal = ~~get_display_authors_editors~~ (A['DisplayEditors'], #e, 'editors', editor_etal);

+

control.maximum , editor_etal = get_display_names (A['DisplayEditors'], #e, 'editors', editor_etal);

last_first_list, EditorCount = list_people(control, e, editor_etal);

if is_set (Editors) then

+

Editors, editor_etal = name_has_etal (Editors, editor_etal, false, 'editors'); -- find and remove variations on et al.

if editor_etal then

Editors = Editors .. ' ' .. cfg.messages['et al']; -- add et al. to editors parameter beause |display-editors=etal

Sətir 2.814: Sətir 2.915:

end

do -- now do interviewers

−

control.maximum = #interviewers_list; ~~-- number of interviewerss~~

+

control.maximum , interviewer_etal = get_display_names (A['DisplayInterviewers'], #interviewers_list, 'interviewers', interviewer_etal);

−

Interviewers = list_people(control, interviewers_list, ~~false~~); ~~-- et al not currently supported~~

+

Interviewers = list_people (control, interviewers_list, interviewer_etal);

end

do -- now do translators

−

control.maximum = #t; ~~-- number of translators~~

+

control.maximum , translator_etal = get_display_names (A['DisplayTranslators'], #t, 'translators', translator_etal);

−

Translators = list_people(control, t, ~~false~~); ~~-- et al not currently supported~~

+

Translators = list_people (control, t, translator_etal);

end

do -- now do contributors

−

control.maximum = #c; ~~-- number of contributors~~

+

control.maximum , contributor_etal = get_display_names (A['DisplayContributors'], #c, 'contributors', contributor_etal);

−

Contributors = list_people(control, c, ~~false~~); ~~-- et al not currently supported~~

+

Contributors = list_people (control, c, contributor_etal);

end

do -- now do authors

−

control.maximum , author_etal = ~~get_display_authors_editors~~ (A['DisplayAuthors'], #a, 'authors', author_etal);

+

control.maximum , author_etal = get_display_names (A['DisplayAuthors'], #a, 'authors', author_etal);

last_first_list = list_people(control, a, author_etal);

if is_set (Authors) then

−

Authors, author_etal = name_has_etal (Authors, author_etal, false); -- find and remove variations on et al.

+

Authors, author_etal = name_has_etal (Authors, author_etal, false, 'authors'); -- find and remove variations on et al.

if author_etal then

Authors = Authors .. ' ' .. cfg.messages['et al']; -- add et al. to authors parameter

Sətir 2.855: Sətir 2.956:

-- special case for chapter format so no error message or cat when chapter not supported

−

if not (in_array(config.CitationClass, {'web', 'news', 'journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'arxiv', 'biorxiv', 'citeseerx'}) or

+

if not (in_array(config.CitationClass, {'web', 'news', 'journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) or

−

('citation' == config.CitationClass and is_set (Periodical) and not is_set (Encyclopedia))) then

+

('citation' == config.CitationClass and (is_set (Periodical) or is_set (ScriptPeriodical)) and not is_set (Encyclopedia))) then

ChapterFormat = style_format (ChapterFormat, ChapterURL, 'chapter-format', 'chapter-url');

end

if not is_set(URL) then

−

if in_array(config.CitationClass, {"web","podcast", "mailinglist"}) ~~then~~ -- |url= required for cite web, cite podcast, and cite mailinglist

+

if in_array(config.CitationClass, {"web","podcast", "mailinglist"}) or -- |url= required for cite web, cite podcast, and cite mailinglist

−

table.insert( z.message_tail, { set_error( 'cite_web_url', {}, true ) } );

+

('citation' == config.CitationClass and ('website' == Periodical_origin or 'script-website' == ScriptPeriodical_origin)) then -- and required for {{citation}} with |website= or |script-website=

+

table.insert( z.message_tail, { set_error( 'cite_web_url', {}, true ) } );

end

Sətir 2.868: Sətir 2.970:

if is_set(AccessDate) and not is_set(ChapterURL)then -- ChapterURL may be set when URL is not set;

table.insert( z.message_tail, { set_error( 'accessdate_missing_url', {}, true ) } );

−

-- AccessDate = ''; ~~-- для рувики: убрано~~

+

AccessDate = '';

end

local OriginalURL, OriginalURLorigin, OriginalFormat, OriginalAccess;

−

DeadURL = DeadURL:lower(); -- used later when assembling archived text

+

-- DeadURL = DeadURL:lower(); -- used later when assembling archived text

+

UrlStatus = UrlStatus:lower(); -- used later when assembling archived text

if is_set( ArchiveURL ) then

if is_set (ChapterURL) then -- if chapter-url is set apply archive url to it

Sətir 2.879: Sətir 2.982:

OriginalURLorigin = ChapterURLorigin; -- name of chapter-url parameter for error messages

OriginalFormat = ChapterFormat; -- and original |chapter-format=

−

if 'no' ~= DeadURL then

+

-- if 'no' ~= DeadURL then

+

if 'live' ~= UrlStatus then

ChapterURL = ArchiveURL -- swap-in the archive's url

ChapterURLorigin = A:ORIGIN('ArchiveURL') -- name of archive-url parameter for error messages

Sətir 2.890: Sətir 2.994:

OriginalFormat = Format; -- and original |format=

OriginalAccess = UrlAccess;

−

if 'no' ~= DeadURL then -- if URL set then archive-url applies to it

+

-- if 'no' ~= DeadURL then -- if URL set then archive-url applies to it

+

if 'live' ~= UrlStatus then -- if URL set then archive-url applies to it

URL = ArchiveURL -- swap-in the archive's url

URLorigin = A:ORIGIN('ArchiveURL') -- name of archive url parameter for error messages

Sətir 2.899: Sətir 3.004:

end

−

if in_array(config.CitationClass, {'web','news','journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'arxiv', 'biorxiv', 'citeseerx'}) or -- if any of the 'periodical' cites except encyclopedia

+

if in_array(config.CitationClass, {'web','news','journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) or -- if any of the 'periodical' cites except encyclopedia

−

('citation' == config.CitationClass and is_set (Periodical) and not is_set (Encyclopedia)) then

+

('citation' == config.CitationClass and (is_set (Periodical) or is_set (ScriptPeriodical)) and not is_set (Encyclopedia)) then

local chap_param;

if is_set (Chapter) then -- get a parameter name from one of these chapter related meta-parameters

Sətir 2.909: Sətir 3.014:

chap_param = A:ORIGIN ('ChapterURL')

elseif is_set (ScriptChapter) then

−

chap_param = ~~A:ORIGIN ('ScriptChapter')~~

+

chap_param = ScriptChapterOrigin;

else is_set (ChapterFormat)

chap_param = A:ORIGIN ('ChapterFormat')

Sətir 2.930: Sətir 3.035:

end

−

Chapter = format_chapter_title (ScriptChapter, Chapter, TransChapter, ChapterURL, ChapterURLorigin, no_quotes, ChapterUrlAccess); -- Contribution is also in Chapter

+

Chapter = format_chapter_title (ScriptChapter, ScriptChapterOrigin, Chapter, TransChapter, ChapterURL, ChapterURLorigin, no_quotes, ChapterUrlAccess); -- Contribution is also in Chapter

if is_set (Chapter) then

Chapter = Chapter .. ChapterFormat ;

Sətir 2.943: Sətir 3.048:

-- Format main title.

−

if is_set (ArchiveURL) and mw.ustring.match (mw.ustring.lower(Title), cfg.special_case_translation['archived_copy']) then -- if title is 'Archived copy' (place holder added by bots that can't find proper title)

−

~~add_maint_cat ('archived_copy'); -- add maintenance category before we modify the content of Title~~

−

~~end~~

if Title:match ('^%(%(.*%)%)$') then -- if keep as written markup:

Sətir 2.958: Sətir 3.060:

end

−

~~if is_set(TitleLink) and is_set(Title) then~~

+

if in_array(config.CitationClass, {'web', 'news', 'journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'mailinglist', 'interview', 'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) or

−

~~Title = make_wikilink (TitleLink, Title);~~

+

('citation' == config.CitationClass and (is_set (Periodical) or is_set (ScriptPeriodical)) and not is_set (Encyclopedia)) or

−

~~end~~

+

('map' == config.CitationClass and (is_set (Periodical) or is_set (ScriptPeriodical))) then -- special case for cite map when the map is in a periodical treat as an article

−

if in_array(config.CitationClass, {'web', 'news', 'journal', 'magazine', 'pressrelease', 'podcast', 'newsgroup', 'mailinglist', 'interview', 'arxiv', 'biorxiv', 'citeseerx'}) or

−

('citation' == config.CitationClass and is_set (Periodical) and not is_set (Encyclopedia)) or

−

('map' == config.CitationClass and is_set (Periodical)) then -- special case for cite map when the map is in a periodical treat as an article

Title = kern_quotes (Title); -- if necessary, separate title's leading and trailing quote marks from Module provided quote marks

Title = wrap_style ('quoted-title', Title);

−

Title = script_concatenate (Title, ScriptTitle); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

+

Title = script_concatenate (Title, ScriptTitle, 'script-title'); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

TransTitle= wrap_style ('trans-quoted-title', TransTitle );

elseif 'report' == config.CitationClass then -- no styling for cite report

−

Title = script_concatenate (Title, ScriptTitle); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

+

Title = script_concatenate (Title, ScriptTitle, 'script-title'); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

TransTitle= wrap_style ('trans-quoted-title', TransTitle ); -- for cite report, use this form for trans-title

else

Title = wrap_style ('italic-title', Title);

−

Title = script_concatenate (Title, ScriptTitle); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

+

Title = script_concatenate (Title, ScriptTitle, 'script-title'); -- <bdi> tags, lang atribute, categorization, etc; must be done after title is wrapped

TransTitle = wrap_style ('trans-italic-title', TransTitle);

end

Sətir 2.986: Sətir 3.084:

end

−

+

if is_set(Title) then

−

if not is_set(TitleLink) and is_set(URL) then

+

if not is_set (TitleLink) and is_set (URL) then

−

+

Title = external_link (URL, Title, URLorigin, UrlAccess) .. TransTitle .. TransError .. Format;

−

Title = external_link( URL, Title, URLorigin, UrlAccess ) .. TransTitle .. TransError .. Format;

URL = ''; -- unset these because no longer needed

Format = "";

+

elseif is_set (TitleLink) and not is_set (URL) then

+

local ws_url;

+

ws_url = wikisource_url_make (TitleLink); -- ignore ws_label return; not used here

+

if ws_url then

+

Title = external_link (ws_url, Title .. ' ', 'ws link in title-link'); -- space char after Title to move icon away from italic text; TODO: a better way to do this?

+

Title = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], TitleLink, Title});

+

Title = Title .. TransTitle .. TransError;

+

else

+

Title = make_wikilink (TitleLink, Title) .. TransTitle .. TransError;

+

end

else

−

Title = Title .. TransTitle .. TransError;

+

local ws_url, ws_label;

+

ws_url, ws_label, L = wikisource_url_make (Title); -- make ws url from |title= interwiki link; link portion L becomes tool tip label

+

if ws_url then

+

Title = Title:gsub ('%b[]', ws_label); -- replace interwiki link with ws_label to retain markup

+

Title = external_link (ws_url, Title .. ' ', 'ws link in title'); -- space char after Title to move icon away from italic text; TODO: a better way to do this?

+

Title = substitute (cfg.presentation['interwiki-icon'], {cfg.presentation['class-wikisource'], L, Title});

+

Title = Title .. TransTitle .. TransError;

+

else

+

Title = Title .. TransTitle .. TransError;

+

end

else

Sətir 3.080: Sətir 3.196:

TitleNote = is_set(TitleNote) and (sepc .. " " .. TitleNote) or "";

if is_set (Edition) then

−

~~if Edition:match ('%f[%a][Ee]d%.?$') or Edition:match ('%f[%a][Ee]dition$') then~~

−

~~add_maint_cat ('extra_text', 'edition');~~

−

~~end~~

Edition = " " .. wrap_msg ('edition', Edition);

else

Sətir 3.088: Sətir 3.201:

end

−

Series = is_set(Series) and (sepc ~~.. " " ..~~ Series) or "";

+

Series = is_set (Series) and wrap_msg ('series', {sepc, Series}) or ""; -- not the same as SeriesNum

−

OrigYear = is_set(OrigYear) and (~~" [" ..~~ OrigYear ~~.. "]"~~) or ""; ~~-- TODO: presentation~~

+

OrigYear = is_set (OrigYear) and wrap_msg ('origyear', OrigYear) or '';

−

+

Agency = is_set (Agency) and wrap_msg ('agency', {sepc, Agency}) or "";

−

Agency = is_set(Agency) and (sepc ~~.. " " ..~~ Agency) or "";

−

Volume = format_volume_issue (Volume, Issue, config.CitationClass, Periodical_origin, sepc, use_lowercase);

------------------------------------ totally unrelated data

−

if is_set(Via) ~~then~~

+

Via = is_set (Via) and wrap_msg ('via', Via) or '';

−

~~Via = " " ..~~ wrap_msg ('via', Via);

−

~~end~~

--[[

Sətir 3.150: Sətir 3.259:

ArchiveDate = set_error('archive_missing_date');

end

−

if "no" == ~~DeadURL~~ then

+

if "live" == UrlStatus then

local arch_text = cfg.messages['archived'];

if sepc ~= "." then arch_text = arch_text:lower() end

−

Archived = sepc .. " " .. substitute( cfg.messages['archived-~~not-dead~~'],

+

Archived = sepc .. " " .. substitute( cfg.messages['archived-live'],

{ external_link( ArchiveURL, arch_text, A:ORIGIN('ArchiveURL'), nil ) .. ArchiveFormat, ArchiveDate } );

if not is_set(OriginalURL) then

Archived = Archived .. " " .. set_error('archive_missing_url');

end

−

elseif is_set(OriginalURL) then -- ~~DeadURL~~ is empty, '~~yes~~', '~~true~~', 'y', '~~unfit', 'usurped~~'

+

elseif is_set(OriginalURL) then -- UrlStatus is empty, 'dead', 'unfit', 'usurped', 'bot: unknown'

local arch_text = cfg.messages['archived-dead'];

if sepc ~= "." then arch_text = arch_text:lower() end

−

if in_array (~~DeadURL~~, {'unfit', 'usurped', 'bot: unknown'}) then

+

if in_array (UrlStatus, {'unfit', 'usurped', 'bot: unknown'}) then

Archived = sepc .. " " .. 'Archived from the original on ' .. ArchiveDate; -- format already styled

−

~~if 'bot: unknown' == DeadURL then~~

+

else -- UrlStatus is empty, 'dead'

−

~~add_maint_cat ('bot:_unknown'); -- and add a category if not already added~~

−

~~else~~

−

~~add_maint_cat ('unfit'); -- and add a category if not already added~~

−

~~end~~

−

else -- ~~DeadURL~~ is empty, '~~yes', 'true', or 'y~~'

Archived = sepc .. " " .. substitute( arch_text,

{ external_link( OriginalURL, cfg.messages['original'], OriginalURLorigin, OriginalAccess ) .. OriginalFormat, ArchiveDate } ); -- format already styled

Sətir 3.227: Sətir 3.331:

-- Several of the above rely upon detecting this as nil, so do it last.

−

if is_set(Periodical) then

+

if (is_set (Periodical) or is_set (ScriptPeriodical) or is_set (TransPeriodical)) then

if is_set(Title) or is_set(TitleNote) then

−

Periodical = sepc .. " " .. ~~wrap_style~~ (~~'italic-title'~~, Periodical)

+

Periodical = sepc .. " " .. format_periodical (ScriptPeriodical, ScriptPeriodical_origin, Periodical, TransPeriodical);

else

−

Periodical = ~~wrap_style~~ (~~'italic-title'~~, Periodical)

+

Periodical = format_periodical (ScriptPeriodical, ScriptPeriodical_origin, Periodical, TransPeriodical);

end

Sətir 3.239: Sətir 3.343:

the annotation directly follows the |title= parameter value in the citation rather than the |event= parameter value (if provided).

]]

−

if "speech" == config.CitationClass then -- cite speech only

+

if "speech" == config.CitationClass then -- cite speech only

−

TitleNote = " (Speech)"; -- annotate the citation

+

TitleNote = " (Speech)"; -- annotate the citation

−

if is_set (Periodical) then -- if Periodical, perhaps because of an included |website= or |journal= parameter

+

if is_set (Periodical) then -- if Periodical, perhaps because of an included |website= or |journal= parameter

−

if is_set (Conference) then -- and if |event= is set

+

if is_set (Conference) then -- and if |event= is set

−

Conference = Conference .. sepc .. " "; -- then add appropriate punctuation to the end of the Conference variable before rendering

+

Conference = Conference .. sepc .. " "; -- then add appropriate punctuation to the end of the Conference variable before rendering

end

Sətir 3.276: Sətir 3.380:

elseif 'episode' == config.CitationClass then -- special case for cite episode

−

tcommon = safe_join( {Title, TitleNote, TitleType, Series~~, Transcript~~, Language, Edition, Publisher}, sepc );

+

tcommon = safe_join( {Title, TitleNote, TitleType, Series, Language, Edition, Publisher}, sepc );

else -- all other CS1 templates

Sətir 3.289: Sətir 3.393:

end

−

local idcommon = safe_join( { ID_list, URL, Archived, AccessDate, Via, SubscriptionRequired, Lay, Quote }, sepc );

+

local idcommon;

+

if 'audio-visual' == config.CitationClass or 'episode' == config.CitationClass then -- special case for cite AV media & cite episode position transcript

+

idcommon = safe_join( { ID_list, URL, Archived, Transcript, AccessDate, Via, SubscriptionRequired, Lay, Quote }, sepc );

+

else

+

idcommon = safe_join( { ID_list, URL, Archived, AccessDate, Via, SubscriptionRequired, Lay, Quote }, sepc );

+

end

+

local text;

local pgtext = Position .. Sheet .. Sheets .. Page .. Pages .. At;

Sətir 3.303: Sətir 3.413:

end

−

end

+

end

−

if is_set(Authors) then

−

~~-- для рувики: конкатенация |coauthors к |authors (без остальной поддержки вроде убирания амперсанта и автоскрытия)~~

−

~~if is_set(Coauthors) then~~

−

~~Authors = Authors .. "; " .. Coauthors;~~

−

~~end~~

−

if (not is_set (Date)) then -- when date is set it's in parentheses; no Authors termination

Authors = terminate_name_list (Authors, sepc); -- when no date, terminate with 0 or 1 sepc and a space

Sətir 3.321: Sətir 3.425:

if (sepc ~= '.') then

in_text = in_text:lower() -- lowercase for cs2

−

end

+

end

+

end

+

if EditorCount <= 1 then

+

post_text = " (" .. cfg.messages['editor'] .. ")"; -- be consistent with no-author, no-date case

else

−

~~if EditorCount <= 1 then~~

+

post_text = " (" .. cfg.messages['editors'] .. ")";

−

post_text = ", " .. cfg.messages['~~editor~~'];

+

end

−

~~else~~

−

~~post_text =~~ ", " ~~.. cfg.messages['editors']~~;

−

~~end~~

−

end

Editors = terminate_name_list (in_text .. Editors .. post_text, sepc); -- terminate with 0 or 1 sepc and a space

end

Sətir 3.369: Sətir 3.472:

if is_set(PostScript) and PostScript ~= sepc then

−

text = safe_join( {text, sepc}, sepc ); --Deals with italics, spaces, etc.

+

text = safe_join( {text, sepc}, sepc ); --Deals with italics, spaces, etc.

text = text:sub(1,-sepc:len()-1);

end

Sətir 3.402: Sətir 3.505:

else

id = ''; -- unset

−

~~end~~

−

~~elseif Ref ~= '' and mw.ustring.sub(Ref, 0, 7) ~= 'CITEREF' then -- для рувики: иная генерация ref-якорей~~

−

~~if mw.ustring.match(id, '%d%d%d%d') then~~

−

~~id = 'CITEREF' .. id~~

−

~~else~~

−

~~local yearForRef = nil~~

−

~~if year and mw.ustring.match(year, '^%d%d%d%d$') then~~

−

~~yearForRef = mw.ustring.match(year, '^%d%d%d%d$')~~

−

~~elseif Date and mw.ustring.match(Date, '%d%d%d%d') then~~

−

~~yearForRef = mw.ustring.match(Date, '%d%d%d%d')~~

−

~~end~~

−

~~if yearForRef then~~

−

~~id = 'CITEREF' .. id .. yearForRef~~

−

~~else~~

−

~~id = '' -- TODO: для рувики: выдавать ошибку?~~

−

~~end~~

end

Sətir 3.437: Sətir 3.524:

end

−

table.insert (render, substitute (cfg.presentation['ocins'], {OCinSoutput})); -- append metadata to the citation

+

table.insert (render, substitute (cfg.presentation['ocins'], {OCinSoutput})); -- append metadata to the citation

−

if #z.message_tail ~~~= 0~~ then

+

if 0 ~= #z.message_tail then

table.insert (render, ' ');

for i,v in ipairs( z.message_tail ) do

Sətir 3.452: Sətir 3.539:

end

−

if #z.maintenance_cats ~~~= 0~~ then

+

if 0 ~= #z.maintenance_cats then

−

~~table.insert (render, '<span class~~=~~"citation~~-~~comment" style="display:none; color:#33aa33; margin~~-~~left:0.3em">');~~

+

local maint_msgs = {}; -- here we collect all of the maint messages

for _, v in ipairs( z.maintenance_cats ) do -- append maintenance categories

−

table.insert (~~render~~, v);

+

local maint = {}; -- here we assemble a maintenence message

−

table.insert (~~render~~, ' (');

+

table.insert (maint, v); -- maint msg is the category name

−

table.insert (~~render~~, make_wikilink (':Category:' .. v, 'link'));

+

table.insert (maint, ' ('); -- open the link text

−

table.insert (~~render~~, ') ');

+

table.insert (maint, make_wikilink (':Category:' .. v, 'link')); -- add the link

+

table.insert (maint, ')'); -- and close it

+

table.insert (maint_msgs, table.concat (maint)); -- assemble new maint message and add it to the maint_msgs table

end

−

table.insert (render, '~~</span>~~');

+

table.insert (render, substitute (cfg.presentation['hidden-maint'], table.concat (maint_msgs, ' '))); -- wrap the group of maint message with proper presentation and save

end

Sətir 3.495: Sətir 3.584:

local state;

−

if in_array (cite_class, {'arxiv', 'biorxiv', 'citeseerx'}) then -- limited parameter sets allowed for these templates

+

if in_array (cite_class, {'arxiv', 'biorxiv', 'citeseerx', 'ssrn'}) then -- limited parameter sets allowed for these templates

state = whitelist.limited_basic_arguments[name];

if true == state then return true; end -- valid actively supported parameter

Sətir 3.557: Sətir 3.646:

]]

−

local function missing_pipe_check (value)

+

local function missing_pipe_check (parameter, value)

local capture;

value = value:gsub ('%b<>', ''); -- remove xml/html tags because attributes: class=, title=, etc

−

capture = value:match ('%s+(%a[%a%d]+)%s*=') or value:match ('^(%a[%a%d]+)%s*='); -- find and categorize parameters with possible missing pipes

+

capture = value:match ('%s+(%a[%w%-]+)%s*=') or value:match ('^(%a[%w%-]+)%s*='); -- find and categorize parameters with possible missing pipes

if capture and validate (capture) then -- if the capture is a valid parameter name

−

~~add_maint_cat~~ ('missing_pipe');

+

table.insert( z.message_tail, {set_error ('missing_pipe',parameter)});

end

−

--[[--------------------------< C ~~S 1~~ . C I T A T I O N >------------------------------------------------------

+

--[[--------------------------< H A S _ E X T R A N E O U S _ P U N C T >--------------------------------------

+

look for extraneous terminal punctuation in most parameter values; parameters listed in skip table are not checked

+

]]

+

local function has_extraneous_punc (param, value)

+

if cfg.punct_skip[param] then

+

return; -- parameter name found in the skip table so done

+

end

+

end

+

--[[--------------------------< C I T A T I O N >--------------------------------------------------------------

This is used by templates such as {{cite book}} to create the actual citation text.

Sətir 3.574: Sətir 3.676:

]]

−

function ~~cs1.~~citation(frame)

+

local function citation(frame)

Frame = frame; -- save a copy incase we need to display an error message in preview mode

local pframe = frame:getParent()

Sətir 3.616: Sətir 3.718:

set_error = utilities.set_error;

select_one = utilities.select_one;

−

add_maint_cat = ~~function () end; -- для рувики: вместо~~ utilities.add_maint_cat;

+

add_maint_cat = utilities.add_maint_cat;

wrap_style = utilities.wrap_style;

safe_for_italics = utilities.safe_for_italics;

is_wikilink = utilities.is_wikilink;

make_wikilink = utilities.make_wikilink;

+

strip_apostrophe_markup = utilities.strip_apostrophe_markup;

z = utilities.z; -- table of error and category tables in Module:Citation/CS1/Utilities

Sətir 3.690: Sətir 3.793:

end

−

missing_pipe_check (v); -- do we think that there is a parameter that is missing a pipe?

+

missing_pipe_check (k, v); -- do we think that there is a parameter that is missing a pipe?

-- TODO: is this the best place for this translation?

args[k] = v;

Sətir 3.701: Sətir 3.804:

if 'string' == type (k) then -- don't evaluate positional parameters

has_invisible_chars (k, v);

+

has_extraneous_punc (k, v); -- look for extraneous terminal punctuation in parameter values

end

Sətir 3.706: Sətir 3.810:

end

−

return ~~cs1~~;

+

--[[--------------------------< E X P O R T E D F U N C T I O N S >------------------------------------------

+

]]

+

return {citation = citation};

WikiSysop

Bürokratlar, İnterfeys idarəçiləri, İdarəçilər

14.405

edits