Dsl: Handle unescaped '@' symbols

dsl.cc

@@ -2256,6 +2256,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           uint32_t offset = curOffset;
           QVector< wstring > insidedHeadwords;
           unsigned linesInsideCard = 0;
+          int dogLine = 0;
 
           // Skip the article's body
           for( ; ; )
@@ -2265,7 +2266,10 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                  || ( curString.size() && !isDslWs( curString[ 0 ] ) ) )
             {
               if( insideInsided )
+              {
+                gdWarning( "Unclosed tag '@' at line %i", dogLine );
                 insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+              }
               break;
             }
 
@@ -2279,6 +2283,26 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
               continue;
             }
+            else
+            {
+              // Embedded card tag must be placed at first position in line after spaces
+              bool isEmbeddedCard = true;
+              for( wstring::size_type i = 0; i < n; i++ )
+              {
+                if( !isDslWs( curString[ i ] ) )
+                {
+                  isEmbeddedCard = false;
+                  break;
+                }
+              }
+              if( !isEmbeddedCard )
+              {
+                gdWarning( "Unescaped '@' symbol at line %i", scanner.getLinesRead() - 1 );
+                continue;
+              }
+            }
+
+            dogLine = scanner.getLinesRead() - 1;
 
             // Handle embedded card
 

dsl_details.cc

@@ -165,6 +165,7 @@ static inline bool checkM( wstring const & dest, wstring const & src )
 ArticleDom::ArticleDom( wstring const & str, string const & dictName,
                         wstring const & headword_):
   root( Node::Tag(), wstring(), wstring() ), stringPos( str.c_str() ),
+  lineStartPos( str.c_str() ),
   transcriptionCount( 0 ),
   dictionaryName( dictName ),
   headword( headword_ )
@@ -180,6 +181,16 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
       nextChar();
 
       if ( ch == L'@' && !escaped )
+      {
+        if( !firstInLine() )
+        {
+          // Not insided card
+          if( dictName.empty() )
+            gdWarning( "Unescaped '@' symbol found" );
+          else
+            gdWarning( "Unescaped '@' symbol found in \"%s\"", dictName.c_str() );
+        }
+        else
         {
           // Insided card
           wstring linkTo;
@@ -260,7 +271,7 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
             ch = L'\n';
             escaped = false;
           }
-
+        }
       } // if ( ch == L'@' )
 
       if ( ch == L'[' && !escaped )
@@ -763,8 +774,21 @@ void ArticleDom::nextChar() throw( eot )
   }
   else
     escaped = false;
+
+  if( ch == '\n' || ch == '\r' )
+    lineStartPos = stringPos;
 }
 
+bool ArticleDom::firstInLine()
+{
+  // Check if current position is first after '\n' and leading spaces
+  if( stringPos <= lineStartPos )
+    return true;
+  for( wchar const * pch = lineStartPos; pch < stringPos - 1; pch++ )
+    if( *pch != ' ' && *pch != '\t' )
+      return false;
+  return true;
+}
 
 /////////////// DslScanner
 

dsl_details.hh

@@ -82,7 +82,9 @@ private:
   void closeTag( wstring const & name, list< Node * > & stack,
                  bool warn = true );
 
-  wchar const * stringPos;
+  bool firstInLine();
+
+  wchar const * stringPos, * lineStartPos;
 
   class eot {};