Module:MOS intervals: Difference between revisions

Line 121:

-- Then sort, as the min and max may be swapped

-- This happens if the dark interval has more small steps than large steps

local dark_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", ~~math.min(sm_min_cents, sm_max_cents), math.max(sm_min_cents~~, ~~sm_max_cents)~~)

local sm_min_sorted = math.min(sm_min_cents, sm_max_cents)

local bright_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", ~~math.min(lg_min_cents~~, ~~lg_max_cents), math.max(lg_min_cents, lg_max_cents)~~)

local sm_max_sorted = math.max(sm_min_cents, sm_max_cents)

local lg_min_sorted = math.min(lg_min_cents, lg_max_cents)

local lg_max_sorted = math.max(lg_min_cents, lg_max_cents)

-- Produce text ranges for intervals

local dark_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", sm_min_sorted, sm_max_sorted)

local bright_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", lg_min_sorted, lg_max_sorted)

result = result

Line 131:

Line 137:

.. "| <span style=\"white-space: nowrap;\">" .. mos.interval_as_string(current_dark_interval) .. "</span>\n"

.. "| " .. dark_interval_range .. "\n"

.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(sm_min_sorted), p.lookup_interval_range(sm_max_sorted)) or "")

.. "|-\n"

.. "| " .. tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case", mos_prefix) .. "\n"

Line 136:

Line 143:

.. "| <span style=\"white-space: nowrap;\">" .. mos.interval_as_string(current_bright_interval) .. "</span>\n"

.. "| " .. bright_interval_range .. "\n"

.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(~~dark_interval_range~~), p.lookup_interval_range(~~bright_interval_range~~)) or "")

.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(lg_min_sorted), p.lookup_interval_range(lg_max_sorted)) or "")

end

@@ Line 121: / Line 121: @@
 			-- Then sort, as the min and max may be swapped
 			-- This happens if the dark interval has more small steps than large steps
-			local dark_interval_range   = string.format("%.1f{{c}} to %.1f{{c}}", math.min(sm_min_cents, sm_max_cents), math.max(sm_min_cents, sm_max_cents))
+			local sm_min_sorted = math.min(sm_min_cents, sm_max_cents)
-			local bright_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", math.min(lg_min_cents, lg_max_cents), math.max(lg_min_cents, lg_max_cents))
+			local sm_max_sorted = math.max(sm_min_cents, sm_max_cents)
+			local lg_min_sorted = math.min(lg_min_cents, lg_max_cents)
+			local lg_max_sorted = math.max(lg_min_cents, lg_max_cents)
+			-- Produce text ranges for intervals
+			local dark_interval_range   = string.format("%.1f{{c}} to %.1f{{c}}", sm_min_sorted, sm_max_sorted)
+			local bright_interval_range = string.format("%.1f{{c}} to %.1f{{c}}", lg_min_sorted, lg_max_sorted)
 			result = result
@@ Line 131: / Line 137: @@
 				.. "| <span style=\"white-space: nowrap;\">" .. mos.interval_as_string(current_dark_interval) .. "</span>\n"
 				.. "| " .. dark_interval_range .. "\n"
+				.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(sm_min_sorted), p.lookup_interval_range(sm_max_sorted)) or "")
 				.. "|-\n"
 				.. "| " .. tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case", mos_prefix) .. "\n"
@@ Line 136: / Line 143: @@
 				.. "| <span style=\"white-space: nowrap;\">" .. mos.interval_as_string(current_bright_interval) .. "</span>\n"
 				.. "| " .. bright_interval_range .. "\n"
-				.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(dark_interval_range), p.lookup_interval_range(bright_interval_range)) or "")
+				.. (show_inregs and string.format("| %s to %s\n", p.lookup_interval_range(lg_min_sorted), p.lookup_interval_range(lg_max_sorted)) or "")
 		end