amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed: reminder text of a keyword can not be disabled if that keyword appears as the start of another word before it.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@818 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-01-11 21:40:17 +00:00
parent 5c801ffce8
commit cefe0823f7
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyword.cpp
+18 -1
View File
@@ -483,7 +483,24 @@ String KeywordDatabase::expand(const String& text,
size_t start = untagged_to_index(s, start_u, true), size_t start = untagged_to_index(s, start_u, true),
end = untagged_to_index(s, start_u + len_u, true); end = untagged_to_index(s, start_u + len_u, true);
if (start == end) continue; // don't match empty keywords if (start == end) continue; // don't match empty keywords
result += s.substr(0, start); // copy text before keyword
result += remove_tag(s.substr(0, start), _("<kw-"));
// a part of s has not been searched for <kw- tags
// this can happen when the trie incorrectly matches too early
for (size_t j = i+1 ; j < start ;) {
Char c = s.GetChar(j);
if (c == _('<')) {
if (is_substr(s, j, _("<kw-")) && j + 4 < s.size()) {
expand_type = s.GetChar(j + 4); // <kw-?>
} else if (is_substr(s, j, _("</kw-"))) {
expand_type = 'a';
}
j = skip_tag(s, j);
} else {
++j;
}
}
// Split the keyword, set parameters in context // Split the keyword, set parameters in context
String total; // the total keyword String total; // the total keyword