hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

DSL: Trim whitespaces while replace tilde

Browse source
This commit is contained in:
Abs62 2017-10-02 20:49:31 +03:00
parent ddc69b95c4
commit 274cef7db9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dsl_details.cc
View file

@ -1338,6 +1338,7 @@ void stripComments( wstring & str, bool & nextLine )
void expandTildes( wstring & str, wstring const & tildeReplacement )
{
wstring tildeValue = Folding::trimWhitespace( tildeReplacement );
for( size_t x = 0; x < str.size(); )
if ( str[ x ] == L'\\' )
x+=2;
@ -1346,15 +1347,15 @@ void expandTildes( wstring & str, wstring const & tildeReplacement )
{
if( x > 0 && str[ x - 1 ] == '^' && ( x < 2 || str[ x - 2 ] != '\\' ) )
{
str.replace( x - 1, 2, tildeReplacement );
str.replace( x - 1, 2, tildeValue );
str[ x - 1 ] = QChar( str[ x - 1 ] ).isUpper() ? QChar::toLower( (uint)str[ x - 1 ] )
: QChar::toUpper( (uint)str[ x - 1 ] );
x = x - 1 + tildeReplacement.size();
x = x - 1 + tildeValue.size();
}
else
{
str.replace( x, 1, tildeReplacement );
x += tildeReplacement.size();
str.replace( x, 1, tildeValue );
x += tildeValue.size();
}
}
else