hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-02 19:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

DSL: Fix formatting in multiline tags

Browse source
This commit is contained in:
Abs62 2013-10-06 19:24:19 +04:00
parent cc8b04ab93
commit c507def22a
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dsl.cc
View file

@ -680,18 +680,7 @@ string DslDictionary::dslToHtml( wstring const & str )
string html = processNodeChildren( dom.root ); string html = processNodeChildren( dom.root );
// Lines seem to indicate paragraphs in Dsls, so we enclose each line within return html;
// a <p></p>.
for( size_t x = html.size(); x--; )
if ( html[ x ] == '\n' )
html.insert( x + 1, "</p><p>" );
return
#if 0 // Enable this to enable dsl source in html as a comment
"<!-- DSL Source:\n" + Utf8::encode( str ) + "\n-->"
#endif
"<p>" + html + "</p>";
} }
string DslDictionary::processNodeChildren( ArticleDom::Node const & node ) string DslDictionary::processNodeChildren( ArticleDom::Node const & node )
@ -706,11 +695,27 @@ string DslDictionary::processNodeChildren( ArticleDom::Node const & node )
} }
string DslDictionary::nodeToHtml( ArticleDom::Node const & node ) string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
{ {
if ( !node.isTag )
return Html::escape( Utf8::encode( node.text ) );
string result; string result;
if ( !node.isTag )
{
result = Html::escape( Utf8::encode( node.text ) );
// Handle all end-of-line
string::size_type n;
// Strip all '\r'
while( ( n = result.find( '\r' ) ) != string::npos )
result.erase( n, 1 );
// Replace all '\n'
while( ( n = result.find( '\n' ) ) != string::npos )
result.replace( n, 1, "<p></p>" );
return result;
}
if ( node.tagName == GD_NATIVE_TO_WS( L"b" ) ) if ( node.tagName == GD_NATIVE_TO_WS( L"b" ) )
result += "<b class=\"dsl_b\">" + processNodeChildren( node ) + "</b>"; result += "<b class=\"dsl_b\">" + processNodeChildren( node ) + "</b>";
else else