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

DSL: Fix escaped symbols handling in <<...>> tag

Browse source
This commit is contained in:
Abs62 2015-04-14 18:01:16 +03:00
parent 7ad717dbb0
commit b7769c6df1
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dsl_details.cc
View file

@ -274,7 +274,7 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
nextChar(); nextChar();
} while( Folding::isWhitespace( ch ) ); } while( Folding::isWhitespace( ch ) );
wstring linkTo; wstring linkTo, linkText;
for( ; ; nextChar() ) for( ; ; nextChar() )
{ {
@ -289,10 +289,21 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
{ {
linkTo.push_back( L'>' ); linkTo.push_back( L'>' );
linkTo.push_back( ch ); linkTo.push_back( ch );
linkText.push_back( L'>' );
if( escaped )
linkText.push_back( L'\\' );
linkText.push_back( ch );
} }
} }
else else
{
linkTo.push_back( ch ); linkTo.push_back( ch );
if( escaped )
linkText.push_back( L'\\' );
linkText.push_back( ch );
}
} }
// Add the corresponding node // Add the corresponding node
@ -304,7 +315,7 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
textNode = 0; textNode = 0;
} }
wstring linkText = Folding::trimWhitespace( linkTo ); linkText = Folding::trimWhitespace( linkText );
processUnsortedParts( linkText, true ); processUnsortedParts( linkText, true );
ArticleDom nodeDom( linkText, dictName, headword_ ); ArticleDom nodeDom( linkText, dictName, headword_ );