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

*! Better support for abbreviation files (multiple keys,

Browse source 
unsorted parts, optional parts, tilde expansions should all now work)
This commit is contained in:
Konstantin Isakov 2009-05-12 14:24:22 +00:00
parent 25dce23d50
commit d10634d3fc
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/dsl.cc
View file

@ -68,7 +68,7 @@ DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
enum enum
{ {
Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian
CurrentFormatVersion = 9 + BtreeIndexing::FormatVersion + Folding::Version CurrentFormatVersion = 11 + BtreeIndexing::FormatVersion + Folding::Version
}; };
struct IdxHeader struct IdxHeader
@ -1290,25 +1290,48 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
if ( curString.empty() || isDslWs( curString[ 0 ] ) ) if ( curString.empty() || isDslWs( curString[ 0 ] ) )
continue; continue;
string key = Utf8::encode( curString ); list< wstring > keys;
if ( !abrvScanner.readNextLine( curString, curOffset ) ) bool eof = false;
// Insert the key and read more, or get to the definition
for( ; ; )
{
processUnsortedParts( curString, true );
if ( keys.size() )
expandTildes( curString, keys.front() );
expandOptionalParts( curString, keys );
if ( !abrvScanner.readNextLine( curString, curOffset ) || curString.empty() )
{ {
fprintf( stderr, "Warning: premature end of file %s\n", abrvFileName.c_str() ); fprintf( stderr, "Warning: premature end of file %s\n", abrvFileName.c_str() );
eof = true;
break; break;
} }
if ( curString.empty() || !isDslWs( curString[ 0 ] ) ) if ( isDslWs( curString[ 0 ] ) )
{
fprintf( stderr, "Warning: malformed file %s\n", abrvFileName.c_str() );
break; break;
} }
if ( eof )
break;
curString.erase( 0, curString.find_first_not_of( GD_NATIVE_TO_WS( L" \t" ) ) ); curString.erase( 0, curString.find_first_not_of( GD_NATIVE_TO_WS( L" \t" ) ) );
// If the string has any dsl markup, we strip it if ( keys.size() )
expandTildes( curString, keys.front() );
abrv[ key ] = Utf8::encode( ArticleDom( curString ).root.renderAsText() ); // If the string has any dsl markup, we strip it
string value = Utf8::encode( ArticleDom( curString ).root.renderAsText() );
for( list< wstring >::iterator i = keys.begin(); i != keys.end();
++i )
{
unescapeDsl( *i );
abrv[ Utf8::encode( Folding::trimWhitespace( *i ) ) ] = value;
}
} }
idxHeader.hasAbrv = 1; idxHeader.hasAbrv = 1;