Module:IPAc2-mh - Revision history

Gilgamesh~enwiki: [w] off-glide tweak

2020-01-11T22:06:00Z

[w] off-glide tweak

@@ Line 1,310: / Line 1,310: @@
 		text = string.gsub(text, "(.)@", "(%1)")
 		text = string.gsub(text, "%)(=?)%(", "%1")
 	end

Gilgamesh~enwiki: Updated logic for surfaced glides and [w] off-glides.

2020-01-11T19:58:27Z

Updated logic for surfaced glides and [w] off-glides.

← Previous revision		Revision as of 19:58, 11 January 2020
Line 850:		Line 850:
	if diphthongs then		if diphthongs then

	text = string_gsub2(text,		text = string_gsub2(text, "(.)([jGw])( )/([aEei])(@?)( )(.)([jGw])",
	"(.)([jGw])( )/([aEei])(@?)( )(.)([jGw])",
	function(		function(
	primaryL, secondaryL, _, vowel, epenth, __, primaryR, secondaryR		primaryL, secondaryL, _, vowel, epenth, __, primaryR, secondaryR
Line 1,045:		Line 1,044:
	text = string.gsub(text, "^ h(j [AV7MQOou])", "H%1")		text = string.gsub(text, "^ h(j [AV7MQOou])", "H%1")
	text = string.gsub(text, "([ptkmnNrl]..@ )h(w [Oou])", "%1H%2")		text = string.gsub(text, "([ptkmnNrl]..@ )h(w [Oou])", "%1H%2")
	text = string.gsub(text,		text = string.gsub(text, "([ptkmnNrl]..@ )h(j "..V..")", "%1H%2")
	"([ptkmnNrl].).@( )h(j [AV7MQOou])", "%1%2H%3")
	text = string.gsub(text, "([AV7MQOou]@? )h(j [AV7MQOou])", "%1H%2")		text = string.gsub(text, "([AV7MQOou]@? )h(j [AV7MQOou])", "%1H%2")
	text = string.gsub(text, "([aEeiAV7M])(@? )hw( )([QOou])",		text = string.gsub(text, "([aEeiAV7M])(@? )hw( )([QOou])",
Line 1,079:		Line 1,077:
	-- Protect word-final epenthetic vowels after non-glides		-- Protect word-final epenthetic vowels after non-glides
	-- from the next operation.		-- from the next operation.
	text = string.gsub(text, "([ptkmnNrl]~~[jGw]~~"..V..")(@ )", "%1/%2")		text = string.gsub(text, "([ptkmnNrl]."..V..")(@ )", "%1/%2")

	-- De-epenthesize vowels if they still neighbor unsurfaced glides.		-- De-epenthesize vowels if they still neighbor unsurfaced glides.
Line 1,114:		Line 1,112:
	if vowelL ~= "" then		if vowelL ~= "" then
	if vowelR ~= "" then		if vowelR ~= "" then
	~~return~~ (		if vowelL == vowelR and
	vowelL~~..epenthL.._..~~		F2[vowelL] == F2_FRONT
		⚫	then
⚫	maxF1(vowelL, vowelR, "E").."^"..__..vowelR
			return vowelL.._..__..vowelR
⚫	)
			else
			return (
			vowelL..epenthL.._..
		⚫	maxF1(vowelL, vowelR, "E").."^"..__..vowelR
			)
			end
	else		else
	return vowelL.._..epenthL..maxF1(vowelL, "E").."^"..__		return vowelL.._..epenthL..maxF1(vowelL, "E").."^"..__
Line 1,131:		Line 1,135:
	)		)

	-- ~~Turn~~ this ~~surfaced~~ ~~glide~~ ~~into~~ an ~~epenthetic vowel~~.		-- Flatten this epenthetic vowel and surfaced glide.
	text = ~~string.gsub~~(text, "([~~ptkmnNrl~~]. ~~[aEei]~~)%^( ~~"..V.."~~)", "%1@%2")		text = string_gsub2(text, "([aAQ] "..C..")E@( )E%^( *)a", "%1a%2%3a")

			-- Collapse this epenthetic vowel and surfaced glide into a semi-vowel.
			text = string.gsub(text, "([aEei])@( *)%1%^", "%2%1^")

	end		end

Gilgamesh~enwiki: Updated rules for special reflexes.

2020-01-11T18:40:09Z

Updated rules for special reflexes.

← Previous revision		Revision as of 18:40, 11 January 2020
Line 509:		Line 509:
	local njv_X = { aEei, AV7i, QOou }		local njv_X = { aEei, AV7i, QOou }
	local hjvtX = { aEei, aEei, QOou }		local hjvtX = { aEei, aEei, QOou }
			local hjvkX = { AV7i, AV7i, QOou }
	local _Gv_X = { AV7i, AV7M, QOou }		local _Gv_X = { AV7i, AV7M, QOou }
	local rGv_X = { AEei, AV7M, QOou } -- not currently used		local rGv_X = { AEei, AV7M, QOou } -- not currently used
Line 522:		Line 523:
	local hXv__ = { _jv_X, hGv_X, hwv_X }		local hXv__ = { _jv_X, hGv_X, hwv_X }
	local hXvt_ = { hjvtX, hGv_X, hwvtX }		local hXvt_ = { hjvtX, hGv_X, hwvtX }
			local hXvk_ = { hjvkX, hGv_X, _wv_X }
	local hXvr_ = { hjvtX, hGv_X, hwv_X }		local hXvr_ = { hjvtX, hGv_X, hwv_X }
	-- [primaryR][F2[secondaryL]][F2[secondaryR]][f1]		-- [primaryR][F2[secondaryL]][F2[secondaryR]][f1]
Line 540:		Line 542:
	}		}
	local h_vX_ = {		local h_vX_ = {
	["p"] = hXv__, ["t"] = hXvt_, ["k"] = ~~hXv__~~,		["p"] = hXv__, ["t"] = hXvt_, ["k"] = hXvk_,
	["m"] = hXv__, ["n"] = hXv__, ["N"] = ~~hXv__~~,		["m"] = hXv__, ["n"] = hXv__, ["N"] = hXvk_,
	["r"] = hXvr_, ["l"] = hXv__		["r"] = hXvr_, ["l"] = hXv__
	}		}
Line 959:		Line 961:
	end		end
	)		)
⚫
	-- Vowels after {yi'y} and {'yiy}
	-- claim the secondary articulation to the right.
⚫	~~subst =~~ function(prefix, vowel, ~~infix, secondaryR~~)
	return prefix..VOWEL[F1[vowel]][F2[secondaryR]]..infix..secondaryR
⚫	end
⚫	text = string.gsub(text, "([yY]. )([~~aEei~~])(@? ~~.)(~~[~~jGw~~])", ~~subst)~~

	-- Change certain vowels in a special environment from round to front.		-- Change certain vowels in a special environment from round to front.
Line 989:		Line 984:

	-- Tag certain glide-vowel-non-glide sequences for special reflexes.		-- Tag certain glide-vowel-non-glide sequences for special reflexes.
	text = string.gsub(text, "(H[jw] )("..V.." [ptkmnNrl])", "%1/%2")		text = string.gsub(text, "([HyY][jw] )("..V.." [ptkmnNrl])", "%1/%2")
	text = string.gsub(text, "^ (h[jw] )("..V.." *[ptkmnNrl])", "%1/%2")		text = string.gsub(text, "^ (h[jw] )("..V.." *[ptkmnNrl])", "%1/%2")
	text = string.gsub(text, "(@ h[jw] )("..V.." *[ptkmnNrl])", "%1/%2")		text = string.gsub(text, "(@ h[jw] )("..V.." *[ptkmnNrl])", "%1/%2")
	text = string.gsub(text,		text = string.gsub(text,
	"([EeiAV7MOou]@? h[jw] )([aAQ] *[ptkmnNrl])", "%1/%2")		"([EeiAV7MOou] h[jw] )([aAQ] *[ptkmnNrl])", "%1/%2")
			text = string.gsub(text, "([iMu] hj )([EeV7] *[kN]G)", "%1/%2")
	text = string.gsub(text,		text = string.gsub(text,
	"(hj [aEei]@? hw )("..V.." [ptkmnNrl])", "%1/%2")		"(hj [aEei]@? hw )("..V.." [ptkmnNrl])", "%1/%2")
Line 1,013:		Line 1,009:

	-- Exceptional phrase-initial reflex.		-- Exceptional phrase-initial reflex.
		⚫	text = string.gsub(text, "^ ([Hh]j )([V7])( *[kN]G)",
		⚫	function(prefix, vowel, suffix)
			return prefix..FRONT_VOWEL[vowel]..suffix
		⚫	end
		⚫	)
	text = string.gsub(text, "^ ([Hh]w )M( *tG)", "%1u%2")		text = string.gsub(text, "^ ([Hh]w )M( *tG)", "%1u%2")

Line 1,032:		Line 1,033:
	if not diphthongs then		if not diphthongs then

	-- Opportunistically front ~~this~~ ~~vowel~~.		-- Opportunistically front these vowels.
	text = string.gsub(text, "(hj )A( [kN]G [kN]?G? "..V..")", ~~"%1a%2")~~		text = string.gsub(text, "(hj )([A7M])( [kN]G [kN]?G? "..V..")",
			function(prefix, vowel, suffix)
			return prefix..FRONT_VOWEL[vowel]..suffix
			end
			)

	-- Surface certain glides.		-- Surface certain glides.

Gilgamesh~enwiki: Code structure modifications - no change in functionality.

2020-01-11T14:25:15Z

Code structure modifications - no change in functionality.

Show changes

Gilgamesh~enwiki: Updated special reflex for {wit}. It is now normally [wɯtˠ], but utterance-initially is [wutˠ].

2020-01-10T16:23:44Z

Updated special reflex for {wit}. It is now normally [wɯtˠ], but utterance-initially is [wutˠ].

← Previous revision		Revision as of 16:23, 10 January 2020
Line 509:		Line 509:
	local rwv_X = { AOou, AOou, QOou }		local rwv_X = { AOou, AOou, QOou }
	local hwv_X = { AV7M, AOou, QOou }		local hwv_X = { AV7M, AOou, QOou }
	local hwvtX = { AV7M, ~~AV7u~~, QOou }		local hwvtX = { AV7M, AV7M, QOou }
	-- [F2[secondaryL]][F2[secondaryR]][f1]		-- [F2[secondaryL]][F2[secondaryR]][f1]
	local _Xv__ = { _jv_X, _Gv_X, _wv_X }		local _Xv__ = { _jv_X, _Gv_X, _wv_X }
Line 1,004:		Line 1,004:
	end		end
	)		)

			-- Exceptional word-initial reflex.
			text = string.gsub(text, "^ ([Hh]w )M( *tG)", "%1u%2")

	end		end

Gilgamesh~enwiki: Fixed epenthetic vowel height bug.

2020-01-09T18:38:16Z

Fixed epenthetic vowel height bug.

← Previous revision		Revision as of 18:38, 9 January 2020
Line 418:		Line 418:
	end		end

	local function maxF1(a, b)		local function maxF1(a, b, c)
	if b then		if c then
	return VOWEL[math.max(2, F1[a], F1[b])][F2_FRONT]		return VOWEL[math.max(F1[a], F1[b], F1[c])][F2_FRONT]
			elseif b then
			return VOWEL[math.max(F1[a], F1[b])][F2_FRONT]
	else		else
	return ~~VOWEL[math.max(2, F1~~[a~~])][F2_FRONT~~]		return FRONT_VOWEL[a]
	end		end
	end		end
Line 439:		Line 441:
	else		else
	if isRalik then		if isRalik then
	return "hj"..maxF1(vowel)..conson.._..conson..__..vowel		return "hj"..maxF1(vowel, "E")..conson.._..conson..__..vowel
	else		else
	return conson..maxF1(vowel).._..conson..__..vowel		return conson..maxF1(vowel, "E").._..conson..__..vowel
	end		end
	end		end
Line 759:		Line 761:

	-- Glides always trigger epenthesis, even neighboring other glides.		-- Glides always trigger epenthesis, even neighboring other glides.
		⚫	text = string_gsub2(text, "([aEei])( h)(.)( )(h)%3( *)([aEei])",
	if not diphthongs then
			function(vowelL, _, secondary, __, primaryR, ___, vowelR)
	-- {ww} always causes the second glide to surface.
			if secondary == "w" then
⚫	text = ~~string.gsub~~(text, "([aEei])( )hw( )~~hw", "%1%2hw~~%~~1@%3Hw"~~)
			primaryR = "H"
⚫	end
			end
			return (
			vowelL.._..secondary..
			maxF1(vowelL, vowelR).."@"..
			__..primaryR..secondary..___..vowelR
			)
		⚫	end
			)
	text = string.gsub(text, "([aEei])( )hG( .[jGw])", "%1%2hG%1@%3")		text = string.gsub(text, "([aEei])( )hG( .[jGw])", "%1%2hG%1@%3")
	text = string.gsub(text, "(.[jGw])( )hG( )([aEei])", "%1%4@%2hG%3%4")		text = string.gsub(text, "(.[jGw])( )hG( )([aEei])", "%1%4@%2hG%3%4")
Line 809:		Line 819:
	text = string_gsub2(text, "(.)( ..)v( .. *)(.)",		text = string_gsub2(text, "(.)( ..)v( .. *)(.)",
	function(vowelL, consonL, consonR, vowelR)		function(vowelL, consonL, consonR, vowelR)
	return vowelL..consonL..maxF1(vowelL, vowelR).."@"..consonR..vowelR		return vowelL..consonL..
			maxF1(vowelL, vowelR, "E").."@"..
			consonR..vowelR
	end		end
	)		)
Line 820:		Line 832:
	text = string_gsub2(text, "([jGw])( )/([aEei])(@? .)%1",		text = string_gsub2(text, "([jGw])( )/([aEei])(@? .)%1",
	function(secondary, _, vowel, infix)		function(secondary, _, vowel, infix)
	return secondary.._..VOWEL[F1[vowel]][F2[secondary]]..		return (
			secondary.._..VOWEL[F1[vowel]][F2[secondary]]..
	infix..secondary		infix..secondary
			)
	end		end
	)		)
Line 982:		Line 996:
	text = string.gsub(text, "([jw])( )/("..V..")( )(.)([jGw])",		text = string.gsub(text, "([jw])( )/("..V..")( )(.)([jGw])",
	function(secondaryL, _, vowel, __, primaryR, secondaryR)		function(secondaryL, _, vowel, __, primaryR, secondaryR)
	return secondaryL.._..		return (
			secondaryL.._..
	VOWEL_REFLEX["h"][primaryR]		VOWEL_REFLEX["h"][primaryR]
	[F2[secondaryL]][F2[secondaryR]][F1[vowel]]..		[F2[secondaryL]][F2[secondaryR]][F1[vowel]]..
	__..primaryR..secondaryR		__..primaryR..secondaryR
			)
	end		end
	)		)
Line 1,058:		Line 1,074:
	"("..V..")( .[jGw])(.)@( .[jGw] *)("..V..")",		"("..V..")( .[jGw])(.)@( .[jGw] *)("..V..")",
	function(vowelL, infixL, vowel, infixR, vowelR)		function(vowelL, infixL, vowel, infixR, vowelR)
	return vowelL..infixL..		return (
			vowelL..infixL..
	VOWEL[F1[maxF1(vowelL, vowelR)]][F2[vowel]].."/@"..		VOWEL[F1[maxF1(vowelL, vowelR, "E")]][F2[vowel]].."/@"..
	infixR..vowelR		infixR..vowelR
			)
	end		end
	)		)
Line 1,083:		Line 1,101:
	return (		return (
	vowelL..epenthL.._..		vowelL..epenthL.._..
	maxF1(vowelL, vowelR).."^"..__..vowelR		maxF1(vowelL, vowelR, "E").."^"..__..vowelR
	)		)
	else		else
	return vowelL.._..epenthL..maxF1(vowelL).."^"..__		return vowelL.._..epenthL..maxF1(vowelL, "E").."^"..__
	end		end
	else		else
	if vowelR ~= "" then		if vowelR ~= "" then
	return _..maxF1(vowelR).."^"..__..vowelR		return _..maxF1(vowelR, "E").."^"..__..vowelR
	else		else
	return _.."i^"..__		return _.."i^"..__

Gilgamesh~enwiki: Removed certain defunct experimental code.

2020-01-09T16:05:35Z

Removed certain defunct experimental code.

← Previous revision		Revision as of 16:05, 9 January 2020
Line 4:		Line 4:
	-- The version of this script on Wikipedia is only a mirror.		-- The version of this script on Wikipedia is only a mirror.

	local ~~IMPLIED_SECONDARIES~~ = ~~true~~		local export = {}

	local MERGED_VOWELS = false		local MERGED_VOWELS = false
	local PARENTHETICAL_EPENTHESIS = true		local PARENTHETICAL_EPENTHESIS = true
	local PHONETIC_DETAILS = false		local PHONETIC_DETAILS = false
	local W_OFF_GLIDES = true		local W_OFF_GLIDES = true

	local export = {}

	local ASYLL = "̯"		local ASYLL = "̯"
Line 32:		Line 31:
	local EMPTY = {}		local EMPTY = {}

			-- Adds elements to a sequence as if it's a set (retains unique elements only).
	local function addUnique(seq, value)		local function addUnique(seq, value)
	for _, value2 in pairs(seq) do		for _, value2 in pairs(seq) do
Line 41:		Line 41:
	end		end

			-- Intended to work the same as JavaScript's Object.assign() function.
	local function assign(target, ...)		local function assign(target, ...)
	local args = { ... }		local args = { ... }
Line 54:		Line 55:

	local function fastTrim(text)		local function fastTrim(text)
		⚫	return string.match(text, "^%s(.-)%s$")
	if text == "" or text == " " then
	return ""
	else
	local atLeft = string.byte(text) == 32
	local atRight = string.byte(text, -1) == 32
	if atLeft then
	if atRight then
	return string.sub(text, 2, -2)
	else
	return string.sub(text, 2)
	end
	elseif atRight then
⚫	return string.~~sub~~(text, 1, -2)
	else
	return text
	end
	end
	end		end

Line 1,277:		Line 1,262:
	end		end

	end

	if IMPLIED_SECONDARIES then
	if PARENTHETICAL_EPENTHESIS then
	text = string.gsub(text, "(.@)", "/%1")
	if diphthongs then
	text = string.gsub(text, "(.=.@)", "/%1")
	end
	end

	if PARENTHETICAL_EPENTHESIS then
	text = string.gsub(text, "/", "")
	end
	end		end

Line 1,301:		Line 1,273:

	-- Convert remaining word gaps to liaison.		-- Convert remaining word gaps to liaison.
	text = ~~string.gsub~~(text~~, "^ *", ""~~)		text = fastTrim(text)
	text = string.gsub(text, " *$", "")
	text = string.gsub(text, " +", false and "_" or "")		text = string.gsub(text, " +", false and "_" or "")

Gilgamesh~enwiki: Uncaching the library functions, per User:Erutuon's performance analysis.

2020-01-09T10:11:13Z

Uncaching the library functions, per User:Erutuon's performance analysis.

Show changes

Gilgamesh~enwiki: Updated some comments near the top. This update mirrors that at Wiktionary.

2020-01-09T08:56:04Z

Updated some comments near the top. This update mirrors that at Wiktionary.

← Previous revision		Revision as of 08:56, 9 January 2020
Line 1:		Line 1:
	-- This module is primarily maintained at:		-- This module is primarily maintained at:
	-- https://en.wiktionary.org/wiki/Module:mh-pronunc		-- https://en.wiktionary.org/wiki/Module:mh-pronunc
			-- Please direct all technical queries and contributions there.
			-- The version of this script on Wikipedia is only a mirror.

	local IMPLIED_SECONDARIES = true		local IMPLIED_SECONDARIES = true
Line 10:		Line 12:
	local export = {}		local export = {}

			-- Cached functions, to help improve performance at Wiktionary.
	local math_max = math.max		local math_max = math.max
	local math_min = math.min		local math_min = math.min

Gilgamesh~enwiki: For now, please participate with the module's refinement at its primary home, wiktionary:Module:mh-pronunc. It is there that primary performance considerations are made first, especially in regards to the module's debug table hosted there.

2020-01-09T08:29:14Z

For now, please participate with the module's refinement at its primary home, wiktionary:Module:mh-pronunc. It is there that primary performance considerations are made first, especially in regards to the module's debug table hosted there.

Show changes