Module:MOS scalesig: Difference between revisions

← Older edit

@@ Line 3: / Line 3: @@
 local getArgs = require("Module:Arguments").getArgs
 local mos = require("Module:MOS")
-local utils = require("Module:Utils")
 local yesno = require("Module:Yesno")
--- "Main" function; calls appropriate mos-string functions
+-- Wrapper function; calls mos module's to-string and to-link functions
-function p._mos_scalesig(input_mos, is_link, is_long)
-	local is_link = yesno(is_link, false)		-- Should the the scalesig be a link?
-	local is_long = yesno(is_long, false)		-- Should the scalesig be in the long form "xL ys (p/q-equivalent)"?
-	return (is_link == true
-		and (is_long and mos.as_long_link(input_mos) or mos.as_link(input_mos))
-		or (is_long and mos.as_long_string(input_mos) or mos.as_string(input_mos)))
-end
--- Wrapper function
 function p.mos_scalesig(frame)
 	local args = getArgs(frame)
 	local input_mos = mos.parse(args["scalesig"])
+	local is_link = yesno(args["link"], false)
+	local is_long = yesno(args["long"], false)
+	local result
-	if input_mos == nil or utils.trim(input_mos) == "" then
+	if is_link then
-		return ""
+		-- Text is a link to the mospage
+		-- Long link links to and displays "xL ys (p/q-equivalent)"
+		-- (Short) link instead displays "xL ys<p/q>"
+		-- Has no effect if it's octave-equivalent.
+		result = (is_long and mos.as_long_link(input_mos) or mos.as_link(input_mos))
+	else
+		-- Text is the scalesig, with nbsp and appropriate brackets added
+		-- Long string displays "xL ys (p/q-equivalent)"
+		-- (Short) string instead displays "xL ys<p/q>"
+		-- Has no effect if it's octave-equivalent.
+		result = (is_long and mos.as_long_string(input_mos) or mos.as_string(input_mos))
 	end
-	local is_link = yesno(args["link"], false)
+	return frame:preprocess(result)
-	local is_long = yesno(args["long"], false)
-	local result = p._mos_scalesig(input_mos, is_link, is_long)
-	local debugg = yesno(args["debug"])
-	return frame:preprocess(debugg == true and "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>" or result)
-end
-function p.tester()
-	local input_mos = mos.new(5, 2)
-	return p._mos_scalesig(input_mos, true, true)
 end
 return p