Module:MOS intro: Difference between revisions

Line 242:

-- Add repetition

if n == 1 then

intro = intro .. ", repeating every " .. (equave_in_cents == 1200 and "[[octave]]." or string.format(" interval of [[%s]] (%.1f{{c}}).", equave_as_ratio, equave_in_cents, round))

intro = intro .. ", repeating every " .. (equave_in_cents == 1200 and "[[octave]]." or string.format(" interval of [[%s]] (%.1f{{cent}}).", equave_as_ratio, equave_in_cents, round))

else

intro = intro .. string.format(", with a [[period]] of %d large %s", nL/n, (nL/n == 1 and "step" or "steps"))

intro = intro .. string.format(" and %d small %s", ns/n, (ns/n == 1 and "step" or "steps"))

intro = intro .. string.format(" that repeats every %.1f{{c}}", period_in_cents)

intro = intro .. string.format(" that repeats every %.1f{{cent}}", period_in_cents)

intro = intro .. (n == 2 and ", or twice every" or string.format(", or %d times every", n)) .. (equave_in_cents == 1200 and " octave." or string.format(" interval of [[%s]] (%.~~1f¢~~).", equave_as_ratio, equave_in_cents, round))

intro = intro .. (n == 2 and ", or twice every" or string.format(", or %d times every", n)) .. (equave_in_cents == 1200 and " octave." or string.format(" interval of [[%s]] (%.1f{{cent}}).", equave_as_ratio, equave_in_cents, round))

end

Line 277:

local dark_gen_max_r = tostring(utils._round_dec(dark_gen_max, round))

intro = intro .. string.format(" [[generator|Generators]] that produce this scale range from %s{{c}} to %s{{c}}, or from %s{{c}} to %s{{c}}.", bright_gen_min_r, bright_gen_max_r, dark_gen_min_r, dark_gen_max_r)

intro = intro .. string.format(" [[generator|Generators]] that produce this scale range from %s{{cent}} to %s{{cent}}, or from %s{{cent}} to %s{{cent}}.", bright_gen_min_r, bright_gen_max_r, dark_gen_min_r, dark_gen_max_r)

-- Rothenberg propriety (rothenprop) info

@@ Line 242: / Line 242: @@
 	-- Add repetition
 	if n == 1 then
-		intro = intro .. ", repeating every " .. (equave_in_cents == 1200 and "[[octave]]." or string.format(" interval of [[%s]] (%.1f{{c}}).", equave_as_ratio, equave_in_cents, round))
+		intro = intro .. ", repeating every " .. (equave_in_cents == 1200 and "[[octave]]." or string.format(" interval of [[%s]] (%.1f{{cent}}).", equave_as_ratio, equave_in_cents, round))
 	else
 		intro = intro .. string.format(", with a [[period]] of %d large %s", nL/n, (nL/n == 1 and "step" or "steps"))
 		intro = intro .. string.format(" and %d small %s", ns/n, (ns/n == 1 and "step" or "steps"))
-		intro = intro .. string.format(" that repeats every %.1f{{c}}", period_in_cents)
+		intro = intro .. string.format(" that repeats every %.1f{{cent}}", period_in_cents)
-		intro = intro .. (n == 2 and ", or twice every" or string.format(", or %d times every", n)) .. (equave_in_cents == 1200 and " octave." or string.format(" interval of [[%s]] (%.1f¢).", equave_as_ratio, equave_in_cents, round))
+		intro = intro .. (n == 2 and ", or twice every" or string.format(", or %d times every", n)) .. (equave_in_cents == 1200 and " octave." or string.format(" interval of [[%s]] (%.1f{{cent}}).", equave_as_ratio, equave_in_cents, round))
 	end
@@ Line 277: / Line 277: @@
 	local dark_gen_max_r = tostring(utils._round_dec(dark_gen_max, round))
-	intro = intro .. string.format(" [[generator|Generators]] that produce this scale range from %s{{c}} to %s{{c}}, or from %s{{c}} to %s{{c}}.", bright_gen_min_r, bright_gen_max_r, dark_gen_min_r, dark_gen_max_r)
+	intro = intro .. string.format(" [[generator|Generators]] that produce this scale range from %s{{cent}} to %s{{cent}}, or from %s{{cent}} to %s{{cent}}.", bright_gen_min_r, bright_gen_max_r, dark_gen_min_r, dark_gen_max_r)
 	-- Rothenberg propriety (rothenprop) info