diff --git a/src/app/class/cut-in-list.ts b/src/app/class/cut-in-list.ts index 9d6f7b2d..a1e55d17 100644 --- a/src/app/class/cut-in-list.ts +++ b/src/app/class/cut-in-list.ts @@ -67,8 +67,7 @@ export class CutInList extends ObjectNode implements InnerXml { if (!cutIn) continue; let isMatch = false; for (const postfix of cutIn.postfixes) { - if (StringUtil.toHalfWidth(text).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix).toUpperCase().trimRight()) - || StringUtil.toHalfWidth(text.replaceAll('>', '→')).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix).toUpperCase().trimRight())) { + if (StringUtil.toHalfWidth(text.replaceAll('>', '→')).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix.replaceAll('>', '→')).toUpperCase().trimRight())) { isMatch = true; if ((postfix.slice(0, 1) == '@' || postfix.slice(0, 1) == '@') && textTagMatch.length < postfix.length) textTagMatch = postfix; } diff --git a/src/app/class/stand-list.ts b/src/app/class/stand-list.ts index 969b4650..b8149b9d 100644 --- a/src/app/class/stand-list.ts +++ b/src/app/class/stand-list.ts @@ -93,8 +93,7 @@ export class StandList extends DataElement { && (conditionType == StandConditionType.Postfix || conditionType == StandConditionType.PostfixOrImage || conditionType == StandConditionType.PostfixAndImage)) { for (let postfix of postfixes.split(/[\r\n]+/g)) { if (postfix == null || postfix.trim().length == 0) continue; - if (StringUtil.toHalfWidth(text).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix).trimRight().toUpperCase()) - || StringUtil.toHalfWidth(text.replaceAll('>', '→')).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix).trimRight().toUpperCase())) { + if (StringUtil.toHalfWidth(text.replaceAll('>', '→')).toUpperCase().trimRight().endsWith(StringUtil.toHalfWidth(postfix.replaceAll('>', '→')).trimRight().toUpperCase())) { if ((postfix.slice(0, 1) == '@' || postfix.slice(0, 1) == '@') && textTagMatch.length < postfix.length) textTagMatch = postfix; conditionPostfix = true; }