Importer, Bürokraten, Moderatoren (CommentStreams), Strukturierte-Diskussionen-Bots, Oberflächenadministratoren, Push-Abonnementverwalter, Oversighter, Administratoren, Kampagnenbearbeiter (Hochladeassistent)
855
Bearbeitungen
Modul:Convert: Unterschied zwischen den Versionen
K
3 Versionen von skanwiki:Modul:Convert importiert
(update from sandbox per Template talk:Convert#Module version 27) |
K (3 Versionen von skanwiki:Modul:Convert importiert) |
||
| Zeile 411: | Zeile 411: | ||
-- If no altitude given, use default (zero altitude = sea level). | -- If no altitude given, use default (zero altitude = sea level). | ||
-- Table gives speed of sound in miles per hour at various altitudes: | -- Table gives speed of sound in miles per hour at various altitudes: | ||
-- altitude = -17,499 to | -- altitude = -17,499 to 302,499 feet | ||
-- mach_table[a + 4] = s where | -- mach_table[a + 4] = s where | ||
-- a = (altitude / 5000) rounded to nearest integer (-3 to | -- a = (altitude / 5000) rounded to nearest integer (-3 to 60) | ||
-- s = speed of sound (mph) at that altitude | -- s = speed of sound (mph) at that altitude | ||
-- LATER: Should calculate result from an interpolation between the next | -- LATER: Should calculate result from an interpolation between the next | ||
| Zeile 423: | Zeile 423: | ||
660.1, 660.1, 660.1, 662.0, 664.3, 666.5, 668.9, 671.1, 673.4, 675.6, -- 11 to 20 | 660.1, 660.1, 660.1, 662.0, 664.3, 666.5, 668.9, 671.1, 673.4, 675.6, -- 11 to 20 | ||
677.9, 683.7, 689.9, 696.0, 702.1, 708.1, 714.0, 719.9, 725.8, 731.6, -- 21 to 30 | 677.9, 683.7, 689.9, 696.0, 702.1, 708.1, 714.0, 719.9, 725.8, 731.6, -- 21 to 30 | ||
737.3, 737.7, 737.7, 736.2, 730.5, 724.6, 718.8, 712.9, 707.0, 701. | 737.3, 737.7, 737.7, 736.2, 730.5, 724.6, 718.8, 712.9, 707.0, 701.1, -- 31 to 40 | ||
695.0, 688.9, 682.8, 676.6, 670.4, 664.1, 657.8, 652.9, 648.3, 643.7, -- 41 to 50 | 695.0, 688.9, 682.8, 676.6, 670.4, 664.1, 657.8, 652.9, 648.3, 643.7, -- 41 to 50 | ||
639.1, 634.4, 629.6, 624.8, 620.0, 615.2, 613.2, 613.2, 613.2, 613.5, -- 51 to 60 | 639.1, 634.4, 629.6, 624.8, 620.0, 615.2, 613.2, 613.2, 613.2, 613.5, -- 51 to 60 | ||
} | } | ||
altitude = altitude or 0 | altitude = altitude or 0 | ||
| Zeile 437: | Zeile 435: | ||
if a < -3 then | if a < -3 then | ||
a = -3 | a = -3 | ||
elseif a > | elseif a > 60 then | ||
a = | a = 60 | ||
end | end | ||
return mach_table[a + 4] * 0.44704 -- mph converted to m/s | return mach_table[a + 4] * 0.44704 -- mph converted to m/s | ||
| Zeile 444: | Zeile 442: | ||
-- END: Code required only for built-in units. | -- END: Code required only for built-in units. | ||
------------------------------------------------------------------------ | ------------------------------------------------------------------------ | ||
local function get_range(word) | local function get_range(word) | ||
| Zeile 1.141: | Zeile 1.117: | ||
local fracfmt = { | local fracfmt = { | ||
{ -- Like {{frac}} (fraction slash). | { -- Like {{frac}} (fraction slash). | ||
'<span class="frac | -- 1/2 : sign, numerator, denominator | ||
'<span class="frac | -- 1+2/3 : signed_wholenumber, numerator, denominator | ||
'<span class="frac nowrap">%s<sup>%s</sup>⁄<sub>%s</sub></span>', | |||
'<span class="frac nowrap">%s<span class="visualhide"> </span><sup>%s</sup>⁄<sub>%s</sub></span>', | |||
}, | }, | ||
{ -- Like {{sfrac}} ( | { -- Like {{sfrac}} (fraction horizontal bar). | ||
'<span class="sfrac | -- 1//2 : sign, numerator, denominator (sign should probably be before the fraction, but then it can wrap, and html is already too long) | ||
'<span class="sfrac | -- 1+2//3 : signed_wholenumber, numerator, denominator | ||
'<span class="sfrac nowrap" style="display:inline-block; vertical-align:-0.5em; font-size:85%%; text-align:center;"><span style="display:block; line-height:1em; padding:0 0.1em;">%s%s</span><span class="visualhide">/</span><span style="display:block; line-height:1em; padding:0 0.1em; border-top:1px solid;">%s</span></span>', | |||
'<span class="sfrac nowrap">%s<span class="visualhide"> </span><span style="display:inline-block; vertical-align:-0.5em; font-size:85%%; text-align:center;"><span style="display:block; line-height:1em; padding:0 0.1em;">%s</span><span class="visualhide">/</span><span style="display:block; line-height:1em; padding:0 0.1em; border-top:1px solid;">%s</span></span></span>', | |||
}, | }, | ||
} | } | ||
| Zeile 1.162: | Zeile 1.140: | ||
wholestr = nil | wholestr = nil | ||
end | end | ||
local | if wholestr then | ||
local decorated = with_separator(parms, wholestr) | |||
if negative then | |||
decorated = MINUS .. decorated | |||
end | |||
local fmt = fracfmt[style][2] | |||
wikitext = format(fmt, decorated, from_en(numstr), from_en(denstr)) | |||
else | |||
local sign = negative and MINUS or '' | |||
wikitext = format(fracfmt[style][1], sign, from_en(numstr), from_en(denstr)) | |||
end | |||
if do_spell then | if do_spell then | ||
if negative then | if negative then | ||
| Zeile 1.177: | Zeile 1.159: | ||
end | end | ||
end | end | ||
wikitext = spell_number(parms, inout, wholestr, numstr, denstr) or wikitext | |||
end | end | ||
return wikitext | return wikitext | ||
end | end | ||
| Zeile 1.550: | Zeile 1.528: | ||
-- v = value of text (text is a number) | -- v = value of text (text is a number) | ||
-- f = true if value is an integer | -- f = true if value is an integer | ||
-- Input can use en digits or digits in local language | -- Input can use en digits or digits in local language, | ||
-- but no Unicode minus, and no fraction. | -- but no separators, no Unicode minus, and no fraction. | ||
if text then | if text then | ||
local number = tonumber(to_en(text)) | local number = tonumber(to_en(text)) | ||
| Zeile 1.691: | Zeile 1.669: | ||
end | end | ||
local function range_text(range, want_name, parms, before, after, inout | local function range_text(range, want_name, parms, before, after, inout) | ||
-- Return before .. rtext .. after | -- Return before .. rtext .. after | ||
-- where rtext is the text that separates two values in a range. | -- where rtext is the text that separates two values in a range. | ||
local rtext, adj_text, exception | local rtext, adj_text, exception | ||
if type(range) == 'table' then | if type(range) == 'table' then | ||
-- Table must specify range text for ('off' and 'on') or ('input' and 'output'), | -- Table must specify range text for ('off' and 'on') or ('input' and 'output'), | ||
| Zeile 1.712: | Zeile 1.689: | ||
end | end | ||
end | end | ||
if rtext == '–' and | if rtext == '–' and after:sub(1, #MINUS) == MINUS then | ||
rtext = ' – ' | rtext = ' – ' | ||
end | end | ||
| Zeile 1.790: | Zeile 1.767: | ||
-- Return true if successful or return false, t where t is an error message table. | -- Return true if successful or return false, t where t is an error message table. | ||
currency_text = nil -- local testing can hold module in memory; must clear globals | currency_text = nil -- local testing can hold module in memory; must clear globals | ||
local accept_any_text = { | |||
input = true, | |||
qid = true, | |||
qual = true, | |||
stylein = true, | |||
styleout = true, | |||
tracking = true, | |||
} | |||
if kv_pairs.adj and kv_pairs.sing then | if kv_pairs.adj and kv_pairs.sing then | ||
-- For enwiki (before translation), warn if attempt to use adj and sing | -- For enwiki (before translation), warn if attempt to use adj and sing | ||
| Zeile 1.802: | Zeile 1.787: | ||
local en_name = text_code.en_option_name[loc_name] | local en_name = text_code.en_option_name[loc_name] | ||
if en_name then | if en_name then | ||
local en_value | local en_value | ||
if | if en_name == '$' or en_name == 'frac' or en_name == 'sigfig' then | ||
if loc_value == '' then | if loc_value == '' then | ||
add_warning(parms, 2, 'cvt_empty_option', loc_name) | add_warning(parms, 2, 'cvt_empty_option', loc_name) | ||
elseif en_name == '$' then | |||
-- Value should be a single character like "€" for the euro currency symbol, but anything is accepted. | |||
currency_text = (loc_value == 'euro') and '€' or loc_value | |||
else | else | ||
local minimum | local minimum | ||
local number, is_integer = get_number(loc_value) | local number, is_integer = get_number(loc_value) | ||
if | if en_name == 'frac' then | ||
minimum = 2 | minimum = 2 | ||
if number and number < 0 then | if number and number < 0 then | ||
| Zeile 1.819: | Zeile 1.804: | ||
end | end | ||
else | else | ||
minimum = | minimum = 1 | ||
end | end | ||
if number and is_integer and number >= minimum then | if number and is_integer and number >= minimum then | ||
en_value = number | en_value = number | ||
else | else | ||
add_warning(parms, 1, (en_name == 'frac' and 'cvt_bad_frac' or 'cvt_bad_sigfig'), loc_name .. '=' .. loc_value) | |||
end | end | ||
end | end | ||
elseif | elseif accept_any_text[en_name] then | ||
en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation | en_value = loc_value ~= '' and loc_value or nil -- accept non-empty user text with no validation | ||
if | if en_name == 'input' then | ||
-- May have something like {{convert|input=}} (empty input) if source is an infobox | -- May have something like {{convert|input=}} (empty input) if source is an infobox | ||
-- with optional fields. In that case, want to output nothing rather than an error. | -- with optional fields. In that case, want to output nothing rather than an error. | ||
| Zeile 1.848: | Zeile 1.820: | ||
end | end | ||
else | else | ||
en_value = | en_value = text_code.en_option_value[en_name][loc_value] | ||
if en_value and en_value:sub(-1) == '?' then | if en_value and en_value:sub(-1) == '?' then | ||
en_value = en_value:sub(1, -2) | en_value = en_value:sub(1, -2) | ||
| Zeile 2.200: | Zeile 2.172: | ||
end | end | ||
if in_unit_table.builtin == 'mach' then | if in_unit_table.builtin == 'mach' then | ||
-- As with old template, a number following Mach as the input unit is the altitude | -- As with old template, a number following Mach as the input unit is the altitude, | ||
-- | -- and there is no way to specify an altitude for the output unit. | ||
-- Could put more code in this function to get any output unit and check for | |||
-- an altitude following that unit. | |||
local success, info = extract_number(parms, parms[i], false, true) | |||
if success then | if success then | ||
i = i + 1 | i = i + 1 | ||
| Zeile 2.436: | Zeile 2.404: | ||
end | end | ||
if in_builtin == 'mach' or out_builtin == 'mach' then | if in_builtin == 'mach' or out_builtin == 'mach' then | ||
local adjust | |||
local | |||
if in_builtin == 'mach' then | if in_builtin == 'mach' then | ||
inscale = | inscale = speed_of_sound(in_current.altitude) | ||
adjust = outscale / 0.1 | |||
else | |||
outscale = speed_of_sound(out_current.altitude) | |||
adjust = 0.1 / inscale | |||
end | end | ||
return true, { | return true, { | ||
outvalue = invalue * (inscale / outscale), | outvalue = invalue * (inscale / outscale), | ||
| Zeile 2.649: | Zeile 2.611: | ||
show = format('%.0f', floor((outvalue / n) + 0.5) * n) | show = format('%.0f', floor((outvalue / n) + 0.5) * n) | ||
end | end | ||
else | else | ||
local inclean = info.clean | local inclean = info.clean | ||
| Zeile 3.275: | Zeile 3.234: | ||
-- For simplicity and because more not needed, handle one range item only. | -- For simplicity and because more not needed, handle one range item only. | ||
local prefix2 = make_id(parms, 2, first_unit) .. ' ' | local prefix2 = make_id(parms, 2, first_unit) .. ' ' | ||
result = range_text(range[1], want_name, parms, result, prefix2 .. valinfo[2].show, 'in' | result = range_text(range[1], want_name, parms, result, prefix2 .. valinfo[2].show, 'in') | ||
end | end | ||
return preunit .. result | return preunit .. result | ||
| Zeile 3.365: | Zeile 3.324: | ||
if range then | if range then | ||
-- For simplicity and because more not needed, handle one range item only. | -- For simplicity and because more not needed, handle one range item only. | ||
result = range_text(range[1], want_name, parms, result, prefix .. valinfo[2].show, inout | result = range_text(range[1], want_name, parms, result, prefix .. valinfo[2].show, inout) | ||
end | end | ||
return preunit .. result | return preunit .. result | ||
| Zeile 3.571: | Zeile 3.530: | ||
local success, result2 = make_result(valinfo[i+1]) | local success, result2 = make_result(valinfo[i+1]) | ||
if not success then return false, result2 end | if not success then return false, result2 end | ||
result = range_text(range[i], want_name, parms, result, result2, inout | result = range_text(range[i], want_name, parms, result, result2, inout) | ||
end | end | ||
end | end | ||
| Zeile 3.701: | Zeile 3.660: | ||
wikitext = wikitext .. parms.warnings | wikitext = wikitext .. parms.warnings | ||
end | end | ||
return true, | return true, wikitext, out_unit_table | ||
end | end | ||