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

Don't warn about unclosed DSL [mN] tags

Browse source 
According to DSL documentation, closing the [mN] tags is optional:
unclosed [mN] tags affect formatting until the end of a card.

As many dictionaries don't close the [mN] tags, GoldenDict printed
multiple unclosed-tag warnings during each word lookup.
This commit is contained in:
Igor Kushnir 2022-11-05 11:51:21 +02:00 committed by Abs62
parent 7c0c586418
commit 38f5fa6c90
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dsl_details.cc
View file

@ -13,6 +13,8 @@
#include <stdio.h> #include <stdio.h>
#include <wctype.h> #include <wctype.h>
#include <algorithm>
namespace Dsl { namespace Dsl {
namespace Details { namespace Details {
@ -180,6 +182,17 @@ bool checkM( wstring const & dest, wstring const & src )
return src == GD_NATIVE_TO_WS( L"m" ) && is_mN( dest ); return src == GD_NATIVE_TO_WS( L"m" ) && is_mN( dest );
} }
/// Closing the [mN] tags is optional. Quote from https://documentation.help/ABBYY-Lingvo8/paragraph_form.htm:
/// Any paragraph from this tag until the end of card or until system meets an «[/m]» (margin shift toggle off) tag
struct MustTagBeClosed
{
bool operator()( ArticleDom::Node const * tag ) const
{
Q_ASSERT( tag->isTag );
return !isAnyM( tag->tagName );
}
};
} // unnamed namespace } // unnamed namespace
ArticleDom::ArticleDom( wstring const & str, string const & dictName, ArticleDom::ArticleDom( wstring const & str, string const & dictName,
@ -642,8 +655,13 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
if ( stack.size() ) if ( stack.size() )
{ {
unsigned const unclosedTagCount = stack.size(); list< Node * >::iterator it = std::find_if( stack.begin(), stack.end(), MustTagBeClosed() );
QByteArray const firstTagName = gd::toQString( stack.front()->tagName ).toUtf8(); if( it == stack.end() )
return; // no unclosed tags that must be closed => nothing to warn about
QByteArray const firstTagName = gd::toQString( ( *it )->tagName ).toUtf8();
++it;
unsigned const unclosedTagCount = 1 + std::count_if( it, stack.end(), MustTagBeClosed() );
if( dictName.empty() ) if( dictName.empty() )
{ {
gdWarning( "Warning: %u tag(s) were unclosed, first tag name \"%s\".\n", gdWarning( "Warning: %u tag(s) were unclosed, first tag name \"%s\".\n",