diff --git a/output/input-A.lua b/output/input-A.lua index 1e1667f..c0f35cb 100644 --- a/output/input-A.lua +++ b/output/input-A.lua @@ -1,7 +1,7 @@ local KEY = "a" local KEY_NAME = "A" local KEY_LENGHT = {3,2,1} -local KANA_RULES = {["za"]={"ざ"},["dya"]={"ぢゃ"},["cha"]={"ちゃ"},["fwa"]={"ふぁ"},["cya"]={"ちゃ"},["dwa"]={"どぁ"},["vya"]={"ゔゃ"},["nya"]={"にゃ"},["hya"]={"ひゃ"},["bya"]={"びゃ"},["hwa"]={"ふぁ"},["a"]={"あ"},["kya"]={"きゃ"},["lwa"]={"ゎ"},["kwa"]={"くぁ"},["sha"]={"しゃ"},["tha"]={"てゃ"},["jya"]={"じゃ"},["gwa"]={"ぐぁ"},["tya"]={"ちゃ"},["sya"]={"しゃ"},["twa"]={"とぁ"},["swa"]={"すぁ"},["pya"]={"ぴゃ"},["xa"]={"ぁ"},["rya"]={"りゃ"},["tsa"]={"つぁ"},["wa"]={"わ"},["ta"]={"た"},["sa"]={"さ"},["ra"]={"ら"},["xya"]={"ゃ"},["dha"]={"でゃ"},["xwa"]={"ゎ"},["va"]={"ゔぁ"},["ma"]={"ま"},["la"]={"ぁ"},["ka"]={"か"},["ja"]={"じゃ"},["ya"]={"や"},["pa"]={"ぱ"},["gya"]={"ぎゃ"},["na"]={"な"},["mya"]={"みゃ"},["da"]={"だ"},["lya"]={"ゃ"},["ba"]={"ば"},["zya"]={"じゃ"},["ha"]={"は"},["ga"]={"が"},["fa"]={"ふぁ"}} +local KANA_RULES = {["kwa"]={"くぁ"},["hya"]={"ひゃ"},["kya"]={"きゃ"},["hwa"]={"ふぁ"},["mya"]={"みゃ"},["lya"]={"ゃ"},["nya"]={"にゃ"},["swa"]={"すぁ"},["pya"]={"ぴゃ"},["tsa"]={"つぁ"},["rya"]={"りゃ"},["tya"]={"ちゃ"},["twa"]={"とぁ"},["xya"]={"ゃ"},["zya"]={"じゃ"},["sya"]={"しゃ"},["cya"]={"ちゃ"},["jya"]={"じゃ"},["bya"]={"びゃ"},["fwa"]={"ふぁ"},["ra"]={"ら"},["tha"]={"てゃ"},["pa"]={"ぱ"},["ma"]={"ま"},["na"]={"な"},["ka"]={"か"},["la"]={"ぁ"},["ya"]={"や"},["za"]={"ざ"},["wa"]={"わ"},["xa"]={"ぁ"},["dwa"]={"どぁ"},["va"]={"ゔぁ"},["sa"]={"さ"},["ta"]={"た"},["xwa"]={"ゎ"},["ba"]={"ば"},["dha"]={"でゃ"},["lwa"]={"ゎ"},["sha"]={"しゃ"},["a"]={"あ"},["cha"]={"ちゃ"},["vya"]={"ゔゃ"},["fa"]={"ふぁ"},["ja"]={"じゃ"},["ga"]={"が"},["ha"]={"は"},["gwa"]={"ぐぁ"},["dya"]={"ぢゃ"},["gya"]={"ぎゃ"},["da"]={"だ"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-B.lua b/output/input-B.lua index dcbbb22..ba0d533 100644 --- a/output/input-B.lua +++ b/output/input-B.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-C.lua b/output/input-C.lua index 497c525..c0a76e7 100644 --- a/output/input-C.lua +++ b/output/input-C.lua @@ -1,7 +1,7 @@ local KEY = "c" local KEY_NAME = "C" local KEY_LENGHT = {2} -local KANA_RULES = {["nc"]={"ん","c"},["cc"]={"っ","c"}} +local KANA_RULES = {["cc"]={"っ","c"},["nc"]={"ん","c"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-D.lua b/output/input-D.lua index 7aa1687..d0f8c14 100644 --- a/output/input-D.lua +++ b/output/input-D.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-E.lua b/output/input-E.lua index c47fb54..e097f97 100644 --- a/output/input-E.lua +++ b/output/input-E.lua @@ -1,7 +1,7 @@ local KEY = "e" local KEY_NAME = "E" local KEY_LENGHT = {3,2,1} -local KANA_RULES = {["gwe"]={"ぐぇ"},["hwe"]={"ふぇ"},["gye"]={"ぎぇ"},["hye"]={"ひぇ"},["e"]={"え"},["dwe"]={"どぇ"},["cye"]={"ちぇ"},["dye"]={"ぢぇ"},["the"]={"てぇ"},["she"]={"しぇ"},["fe"]={"ふぇ"},["de"]={"で"},["be"]={"べ"},["tye"]={"ちぇ"},["ne"]={"ね"},["me"]={"め"},["le"]={"ぇ"},["ke"]={"け"},["je"]={"じぇ"},["swe"]={"すぇ"},["he"]={"へ"},["ge"]={"げ"},["ve"]={"ゔぇ"},["twe"]={"とぇ"},["te"]={"て"},["se"]={"せ"},["re"]={"れ"},["zye"]={"じぇ"},["pe"]={"ぺ"},["fwe"]={"ふぇ"},["rye"]={"りぇ"},["sye"]={"しぇ"},["mye"]={"みぇ"},["nye"]={"にぇ"},["ze"]={"ぜ"},["ye"]={"いぇ"},["xe"]={"ぇ"},["we"]={"うぇ"},["dhe"]={"でぇ"},["che"]={"ちぇ"},["tse"]={"つぇ"},["pye"]={"ぴぇ"},["kwe"]={"くぇ"},["jye"]={"じぇ"},["kye"]={"きぇ"},["bye"]={"びぇ"}} +local KANA_RULES = {["swe"]={"すぇ"},["twe"]={"とぇ"},["sye"]={"しぇ"},["tye"]={"ちぇ"},["mye"]={"みぇ"},["nye"]={"にぇ"},["pye"]={"ぴぇ"},["kwe"]={"くぇ"},["jye"]={"じぇ"},["kye"]={"きぇ"},["gwe"]={"ぐぇ"},["hwe"]={"ふぇ"},["gye"]={"ぎぇ"},["fwe"]={"ふぇ"},["zye"]={"じぇ"},["ze"]={"ぜ"},["te"]={"て"},["re"]={"れ"},["se"]={"せ"},["xe"]={"ぇ"},["ye"]={"いぇ"},["ve"]={"ゔぇ"},["we"]={"うぇ"},["le"]={"ぇ"},["me"]={"め"},["je"]={"じぇ"},["ke"]={"け"},["pe"]={"ぺ"},["ne"]={"ね"},["she"]={"しぇ"},["de"]={"で"},["dwe"]={"どぇ"},["be"]={"べ"},["dye"]={"ぢぇ"},["he"]={"へ"},["cye"]={"ちぇ"},["fe"]={"ふぇ"},["ge"]={"げ"},["hye"]={"ひぇ"},["e"]={"え"},["rye"]={"りぇ"},["bye"]={"びぇ"},["tse"]={"つぇ"},["the"]={"てぇ"},["dhe"]={"でぇ"},["che"]={"ちぇ"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-F.lua b/output/input-F.lua index f7f16d6..b1afc65 100644 --- a/output/input-F.lua +++ b/output/input-F.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-G.lua b/output/input-G.lua index d471a97..7e0550b 100644 --- a/output/input-G.lua +++ b/output/input-G.lua @@ -1,7 +1,7 @@ local KEY = "g" local KEY_NAME = "G" local KEY_LENGHT = {2} -local KANA_RULES = {["gg"]={"っ","g"},["ng"]={"ん","g"}} +local KANA_RULES = {["ng"]={"ん","g"},["gg"]={"っ","g"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-H.lua b/output/input-H.lua index 1ae5196..e4a79ab 100644 --- a/output/input-H.lua +++ b/output/input-H.lua @@ -1,7 +1,7 @@ local KEY = "h" local KEY_NAME = "H" local KEY_LENGHT = {2} -local KANA_RULES = {["hh"]={"っ","h"},["nh"]={"ん","h"}} +local KANA_RULES = {["nh"]={"ん","h"},["hh"]={"っ","h"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-I.lua b/output/input-I.lua index abf3aa8..72416e9 100644 --- a/output/input-I.lua +++ b/output/input-I.lua @@ -1,7 +1,7 @@ local KEY = "i" local KEY_NAME = "I" local KEY_LENGHT = {3,2,1} -local KANA_RULES = {["i"]={"い"},["dyi"]={"ぢぃ"},["cyi"]={"ちぃ"},["byi"]={"びぃ"},["hyi"]={"ひぃ"},["gyi"]={"ぎぃ"},["hwi"]={"ふぃ"},["gwi"]={"ぐぃ"},["thi"]={"てぃ"},["fwi"]={"ふぃ"},["shi"]={"し"},["bi"]={"び"},["gi"]={"ぎ"},["fi"]={"ふぃ"},["di"]={"ぢ"},["ki"]={"き"},["ji"]={"じ"},["hi"]={"ひ"},["zyi"]={"じぃ"},["ni"]={"に"},["mi"]={"み"},["li"]={"ぃ"},["si"]={"し"},["ri"]={"り"},["twi"]={"とぃ"},["pi"]={"ぴ"},["wi"]={"うぃ"},["vi"]={"ゔぃ"},["dwi"]={"どぃ"},["ti"]={"ち"},["chi"]={"ち"},["tyi"]={"ちぃ"},["syi"]={"しぃ"},["xi"]={"ぃ"},["zi"]={"じ"},["kwi"]={"くぃ"},["ryi"]={"りぃ"},["swi"]={"すぃ"},["myi"]={"みぃ"},["tsi"]={"つぃ"},["kyi"]={"きぃ"},["jyi"]={"じぃ"},["dhi"]={"でぃ"},["pyi"]={"ぴぃ"},["yi"]={"うぃ"},["nyi"]={"にぃ"}} +local KANA_RULES = {["nyi"]={"にぃ"},["myi"]={"みぃ"},["tsi"]={"つぃ"},["kyi"]={"きぃ"},["swi"]={"すぃ"},["hyi"]={"ひぃ"},["twi"]={"とぃ"},["gwi"]={"ぐぃ"},["fwi"]={"ふぃ"},["tyi"]={"ちぃ"},["hwi"]={"ふぃ"},["ryi"]={"りぃ"},["pyi"]={"ぴぃ"},["zyi"]={"じぃ"},["yi"]={"うぃ"},["zi"]={"じ"},["wi"]={"うぃ"},["xi"]={"ぃ"},["vi"]={"ゔぃ"},["si"]={"し"},["ti"]={"ち"},["ri"]={"り"},["bi"]={"び"},["shi"]={"し"},["thi"]={"てぃ"},["ni"]={"に"},["ki"]={"き"},["li"]={"ぃ"},["kwi"]={"くぃ"},["ji"]={"じ"},["gi"]={"ぎ"},["hi"]={"ひ"},["mi"]={"み"},["fi"]={"ふぃ"},["pi"]={"ぴ"},["di"]={"ぢ"},["syi"]={"しぃ"},["dwi"]={"どぃ"},["dhi"]={"でぃ"},["chi"]={"ち"},["dyi"]={"ぢぃ"},["cyi"]={"ちぃ"},["byi"]={"びぃ"},["i"]={"い"},["jyi"]={"じぃ"},["gyi"]={"ぎぃ"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-J.lua b/output/input-J.lua index 3cf0ae9..8aa5f81 100644 --- a/output/input-J.lua +++ b/output/input-J.lua @@ -1,7 +1,7 @@ local KEY = "j" local KEY_NAME = "J" local KEY_LENGHT = {2} -local KANA_RULES = {["jj"]={"っ","j"},["nj"]={"ん","j"}} +local KANA_RULES = {["nj"]={"ん","j"},["jj"]={"っ","j"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-K.lua b/output/input-K.lua index c92a21a..681b58e 100644 --- a/output/input-K.lua +++ b/output/input-K.lua @@ -1,7 +1,7 @@ local KEY = "k" local KEY_NAME = "K" local KEY_LENGHT = {2} -local KANA_RULES = {["nk"]={"ん","k"},["kk"]={"っ","k"}} +local KANA_RULES = {["kk"]={"っ","k"},["nk"]={"ん","k"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-L.lua b/output/input-L.lua index 12337c8..53f2429 100644 --- a/output/input-L.lua +++ b/output/input-L.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-M.lua b/output/input-M.lua index b743b7a..3c8046e 100644 --- a/output/input-M.lua +++ b/output/input-M.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-N.lua b/output/input-N.lua index 289ad9d..8ea8dc0 100644 --- a/output/input-N.lua +++ b/output/input-N.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-O.lua b/output/input-O.lua index 1081dbe..e8b1003 100644 --- a/output/input-O.lua +++ b/output/input-O.lua @@ -1,7 +1,7 @@ local KEY = "o" local KEY_NAME = "O" local KEY_LENGHT = {3,2,1} -local KANA_RULES = {["nyo"]={"にょ"},["myo"]={"みょ"},["lyo"]={"ょ"},["syo"]={"しょ"},["ryo"]={"りょ"},["tso"]={"つぉ"},["pyo"]={"ぴょ"},["vyo"]={"ゔょ"},["o"]={"お"},["tyo"]={"ちょ"},["zyo"]={"じょ"},["xyo"]={"ょ"},["cyo"]={"ちょ"},["byo"]={"びょ"},["do"]={"ど"},["gyo"]={"ぎょ"},["dwo"]={"どぉ"},["gwo"]={"ぐぉ"},["fwo"]={"ふぉ"},["kyo"]={"きょ"},["hwo"]={"ふぉ"},["kwo"]={"くぉ"},["hyo"]={"ひょ"},["no"]={"の"},["po"]={"ぽ"},["so"]={"そ"},["ro"]={"ろ"},["dho"]={"でょ"},["to"]={"と"},["go"]={"ご"},["fo"]={"ふぉ"},["ho"]={"ほ"},["ko"]={"こ"},["jo"]={"じょ"},["mo"]={"も"},["lo"]={"ぉ"},["sho"]={"しょ"},["bo"]={"ぼ"},["dyo"]={"ぢょ"},["tho"]={"てょ"},["swo"]={"すぉ"},["wo"]={"を"},["vo"]={"ゔぉ"},["yo"]={"よ"},["xo"]={"ぉ"},["cho"]={"ちょ"},["zo"]={"ぞ"},["jyo"]={"じょ"},["two"]={"とぉ"}} +local KANA_RULES = {["dyo"]={"ぢょ"},["dwo"]={"どぉ"},["gyo"]={"ぎょ"},["hyo"]={"ひょ"},["jyo"]={"じょ"},["kyo"]={"きょ"},["lyo"]={"ょ"},["myo"]={"みょ"},["nyo"]={"にょ"},["pyo"]={"ぴょ"},["ryo"]={"りょ"},["syo"]={"しょ"},["swo"]={"すぉ"},["two"]={"とぉ"},["tso"]={"つぉ"},["kwo"]={"くぉ"},["gwo"]={"ぐぉ"},["hwo"]={"ふぉ"},["byo"]={"びょ"},["cyo"]={"ちょ"},["bo"]={"ぼ"},["o"]={"お"},["do"]={"ど"},["fo"]={"ふぉ"},["go"]={"ご"},["ho"]={"ほ"},["tyo"]={"ちょ"},["jo"]={"じょ"},["ko"]={"こ"},["lo"]={"ぉ"},["mo"]={"も"},["no"]={"の"},["fwo"]={"ふぉ"},["po"]={"ぽ"},["vyo"]={"ゔょ"},["ro"]={"ろ"},["so"]={"そ"},["to"]={"と"},["sho"]={"しょ"},["vo"]={"ゔぉ"},["wo"]={"を"},["xo"]={"ぉ"},["yo"]={"よ"},["zo"]={"ぞ"},["zyo"]={"じょ"},["xyo"]={"ょ"},["tho"]={"てょ"},["dho"]={"でょ"},["cho"]={"ちょ"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-P.lua b/output/input-P.lua index 2dd223d..bfe2185 100644 --- a/output/input-P.lua +++ b/output/input-P.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-Q.lua b/output/input-Q.lua index e3fd8c9..bc2e2c7 100644 --- a/output/input-Q.lua +++ b/output/input-Q.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-R.lua b/output/input-R.lua index 1d56758..4d96020 100644 --- a/output/input-R.lua +++ b/output/input-R.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-S.lua b/output/input-S.lua index 07adf94..12bc08b 100644 --- a/output/input-S.lua +++ b/output/input-S.lua @@ -1,7 +1,7 @@ local KEY = "s" local KEY_NAME = "S" local KEY_LENGHT = {2} -local KANA_RULES = {["ns"]={"ん","s"},["ss"]={"っ","s"}} +local KANA_RULES = {["ss"]={"っ","s"},["ns"]={"ん","s"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-T.lua b/output/input-T.lua index 60257c4..6b7dd23 100644 --- a/output/input-T.lua +++ b/output/input-T.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-U.lua b/output/input-U.lua index 13c4283..db75243 100644 --- a/output/input-U.lua +++ b/output/input-U.lua @@ -1,7 +1,7 @@ local KEY = "u" local KEY_NAME = "U" local KEY_LENGHT = {4,3,2,1} -local KANA_RULES = {["xtsu"]={"っ"},["byu"]={"びゅ"},["cyu"]={"ちゅ"},["fwu"]={"ふぅ"},["gwu"]={"ぐぅ"},["dwu"]={"どぅ"},["gyu"]={"ぎゅ"},["hyu"]={"ひゅ"},["kwu"]={"くぅ"},["jyu"]={"じゅ"},["kyu"]={"きゅ"},["lyu"]={"ゅ"},["myu"]={"みゅ"},["nyu"]={"にゅ"},["pyu"]={"ぴゅ"},["swu"]={"すぅ"},["pu"]={"ぷ"},["tsu"]={"つ"},["nu"]={"ぬ"},["mu"]={"む"},["lu"]={"ぅ"},["ku"]={"く"},["zu"]={"ず"},["yu"]={"ゆ"},["xu"]={"ぅ"},["wu"]={"う"},["vu"]={"ゔ"},["tu"]={"つ"},["su"]={"す"},["bu"]={"ぶ"},["shu"]={"しゅ"},["ju"]={"じゅ"},["hu"]={"ふ"},["gu"]={"ぐ"},["fu"]={"ふ"},["du"]={"づ"},["syu"]={"しゅ"},["zyu"]={"じゅ"},["dyu"]={"ぢゅ"},["twu"]={"とぅ"},["u"]={"う"},["tyu"]={"ちゅ"},["chu"]={"ちゅ"},["thu"]={"てゅ"},["hwu"]={"ふぅ"},["xyu"]={"ゅ"},["vyu"]={"ゔゅ"},["dhu"]={"でゅ"},["ryu"]={"りゅ"},["ltu"]={"っ"},["xtu"]={"っ"},["ru"]={"る"}} +local KANA_RULES = {["zyu"]={"じゅ"},["twu"]={"とぅ"},["syu"]={"しゅ"},["tyu"]={"ちゅ"},["swu"]={"すぅ"},["vyu"]={"ゔゅ"},["xtsu"]={"っ"},["jyu"]={"じゅ"},["kyu"]={"きゅ"},["lyu"]={"ゅ"},["kwu"]={"くぅ"},["nyu"]={"にゅ"},["pyu"]={"ぴゅ"},["dhu"]={"でゅ"},["byu"]={"びゅ"},["cyu"]={"ちゅ"},["dyu"]={"ぢゅ"},["hwu"]={"ふぅ"},["gyu"]={"ぎゅ"},["hyu"]={"ひゅ"},["gwu"]={"ぐぅ"},["ltu"]={"っ"},["fu"]={"ふ"},["gu"]={"ぐ"},["shu"]={"しゅ"},["mu"]={"む"},["ju"]={"じゅ"},["ku"]={"く"},["hu"]={"ふ"},["u"]={"う"},["thu"]={"てゅ"},["tsu"]={"つ"},["du"]={"づ"},["lu"]={"ぅ"},["bu"]={"ぶ"},["chu"]={"ちゅ"},["xu"]={"ぅ"},["yu"]={"ゆ"},["vu"]={"ゔ"},["wu"]={"う"},["xtu"]={"っ"},["xyu"]={"ゅ"},["zu"]={"ず"},["myu"]={"みゅ"},["pu"]={"ぷ"},["fwu"]={"ふぅ"},["nu"]={"ぬ"},["dwu"]={"どぅ"},["tu"]={"つ"},["ryu"]={"りゅ"},["ru"]={"る"},["su"]={"す"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-V.lua b/output/input-V.lua index 74bae75..31d6c83 100644 --- a/output/input-V.lua +++ b/output/input-V.lua @@ -1,7 +1,7 @@ local KEY = "v" local KEY_NAME = "V" local KEY_LENGHT = {2} -local KANA_RULES = {["vv"]={"っ","v"},["nv"]={"ん","v"}} +local KANA_RULES = {["nv"]={"ん","v"},["vv"]={"っ","v"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-W.lua b/output/input-W.lua index 5493139..d4d99fd 100644 --- a/output/input-W.lua +++ b/output/input-W.lua @@ -1,7 +1,7 @@ local KEY = "w" local KEY_NAME = "W" local KEY_LENGHT = {2} -local KANA_RULES = {["ww"]={"っ","w"},["nw"]={"ん","w"}} +local KANA_RULES = {["nw"]={"ん","w"},["ww"]={"っ","w"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-X.lua b/output/input-X.lua index 408c8bc..ca14028 100644 --- a/output/input-X.lua +++ b/output/input-X.lua @@ -1,7 +1,7 @@ local KEY = "x" local KEY_NAME = "X" local KEY_LENGHT = {2} -local KANA_RULES = {["nx"]={"ん","x"},["xx"]={"っ","x"}} +local KANA_RULES = {["xx"]={"っ","x"},["nx"]={"ん","x"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-Y.lua b/output/input-Y.lua index eb5baf2..6565da0 100644 --- a/output/input-Y.lua +++ b/output/input-Y.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-Z.lua b/output/input-Z.lua index 7fcd305..648b60c 100644 --- a/output/input-Z.lua +++ b/output/input-Z.lua @@ -1,7 +1,7 @@ local KEY = "z" local KEY_NAME = "Z" local KEY_LENGHT = {2} -local KANA_RULES = {["nz"]={"ん","z"},["zz"]={"っ","z"}} +local KANA_RULES = {["zz"]={"っ","z"},["nz"]={"ん","z"}} local SLIDE_CHARS = {"ゃ","ゅ","ょ","ぁ","ぃ","ぅ","ぇ","ぉ","`"} local LYRIC_END_CHARS = {"+","-","`"} local NEXT_NOTE_CHAR = "/" @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_backquote.lua b/output/input-_backquote.lua index ea898b8..7a2a329 100644 --- a/output/input-_backquote.lua +++ b/output/input-_backquote.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_hyphen.lua b/output/input-_hyphen.lua index 7b8a02d..3dd956e 100644 --- a/output/input-_hyphen.lua +++ b/output/input-_hyphen.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_period.lua b/output/input-_period.lua index d6509e6..c99c44d 100644 --- a/output/input-_period.lua +++ b/output/input-_period.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_plus.lua b/output/input-_plus.lua index 93e93df..fb794d0 100644 --- a/output/input-_plus.lua +++ b/output/input-_plus.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_singlequote.lua b/output/input-_singlequote.lua index e86eb29..54c6e48 100644 --- a/output/input-_singlequote.lua +++ b/output/input-_singlequote.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/input-_slash.lua b/output/input-_slash.lua index 05f7398..183759e 100644 --- a/output/input-_slash.lua +++ b/output/input-_slash.lua @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/output/lyricClear.lua b/output/lyricClear.lua index 370dc54..a636917 100644 --- a/output/lyricClear.lua +++ b/output/lyricClear.lua @@ -32,9 +32,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/templates/input.txt b/templates/input.txt index 00f71d2..1d31276 100644 --- a/templates/input.txt +++ b/templates/input.txt @@ -77,9 +77,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE diff --git a/templates/lyricClear.txt b/templates/lyricClear.txt index 683cc2f..2ed263a 100644 --- a/templates/lyricClear.txt +++ b/templates/lyricClear.txt @@ -32,9 +32,11 @@ end ---@param note Note local function focusNote(mainEditor, note) local coordinate = mainEditor:getNavigation() + local currentGroup = mainEditor:getCurrentGroup() local viewRangeHorizontal = coordinate:getTimeViewRange() local viewLeft, viewRight = viewRangeHorizontal[1], viewRangeHorizontal[2] - local noteLeft, noteRight = note:getOnset(), note:getEnd() + local groupLeft = currentGroup:getOnset() + local noteLeft, noteRight = note:getOnset() + groupLeft, note:getEnd() + groupLeft local toleranceBlicks = (viewRight - viewLeft) * VIEW_TOLERANCE