issue 6612 Issue with handling of emoji

Regression on adding emoji. - in case of multiple levels of `::` (e.g. `U::V::W`) this resulted in the fact that `:V:` was seen as an emoji and handled as such - in a citelist it is possible to have `pages = {104:1--104:8},`, `number = {4},` and `volume = {28},` but this is translated into `28(4):104:1–104:8` giving a false positive on `:104:`. the citelist has been excluded from emoji handling.
doxygen · Nov 12, 2018 · d748615 · d748615
1 parent 50fd576
commit d748615
Showing 1 changed file with 39 additions and 10 deletions.
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
@@ -38,6 +38,7 @@
 #include "definition.h"
 #include "doxygen.h"
 #include "portable.h"
+#include "cite.h"
 
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
@@ -395,9 +396,9 @@ CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."=']
 ESCWORD   ("%"{ID}(("::"|"."){ID})*)|("%'")
 CHARWORDQ1 [^ \-+0-9\t\n\r\\@<>()\[\]:;\?{}&%$#,."=']
 WORD1     {ESCWORD}|{CHARWORDQ1}{CHARWORDQ}*|"{"|"}"|"'\"'"|("\""[^"\n]*\n?[^"\n]*"\"")
-WORD2     "."|","|"("|")"|"["|"]"|":"|";"|"\?"|"="|"'"
+WORD2     "."|","|"("|")"|"["|"]"|"::"|":"|";"|"\?"|"="|"'"
 WORD1NQ   {ESCWORD}|{CHARWORDQ}+|"{"|"}"
-WORD2NQ   "."|","|"("|")"|"["|"]"|":"|";"|"\?"|"="|"'"
+WORD2NQ   "."|","|"("|")"|"["|"]"|"::"|":"|";"|"\?"|"="|"'"
 CAPTION   [cC][aA][pP][tT][iI][oO][nN]
 HTMLTAG   "<"(("/")?){ID}({WS}+{ATTRIB})*{WS}*(("/")?)">" 
 HTMLKEYL  "strong"|"center"|"table"|"caption"|"small"|"code"|"dfn"|"var"|"img"|"pre"|"sub"|"sup"|"tr"|"td"|"th"|"ol"|"ul"|"li"|"tt"|"kbd"|"em"|"hr"|"dl"|"dt"|"dd"|"br"|"i"|"a"|"b"|"p"|"strike"|"u"
@@ -682,8 +683,15 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
                          return TK_SYMBOL;
                        }
 <St_Para,St_Text>{EMOJI} { /* emoji symbol */ 
-                         g_token->name = yytext;
-                         return TK_EMOJI;
+                         if (g_fileName == CiteConsts::fileName)
+                         {
+                           REJECT;
+                         }
+                         else
+                         {
+                           g_token->name = yytext;
+                           return TK_EMOJI;
+                         }
                        }
 
   /********* patterns for linkable words ******************/
@@ -932,8 +940,15 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
   		         return TK_SYMBOL;
                        }
 <St_TitleN>{EMOJI}     { /* emoji */
-                         g_token->name = yytext;
-  		         return TK_EMOJI;
+                         if (g_fileName == CiteConsts::fileName)
+                         {
+                           REJECT;
+                         }
+                         else
+                         {
+                           g_token->name = yytext;
+                           return TK_EMOJI;
+                         }
                        }
 <St_TitleN>{HTMLTAG}   {
   		       }
@@ -972,8 +987,15 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
   		         return TK_SYMBOL;
                        }
 <St_TitleQ>{EMOJI}  { /* emoji */
-                         g_token->name = yytext;
-  		         return TK_EMOJI;
+                         if (g_fileName == CiteConsts::fileName)
+                         {
+                           REJECT;
+                         }
+                         else
+                         {
+                           g_token->name = yytext;
+                           return TK_EMOJI;
+                         }
                        }
 <St_TitleQ>{SPCMD1}    |   
 <St_TitleQ>{SPCMD2}    { /* special command */ 
@@ -1107,8 +1129,15 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
   		         return TK_SYMBOL;
                        }
 <St_Ref2>{EMOJI}    { /* emoji */
-                         g_token->name = yytext;
-  		         return TK_EMOJI;
+                         if (g_fileName == CiteConsts::fileName)
+                         {
+                           REJECT;
+                         }
+                         else
+                         {
+                           g_token->name = yytext;
+                           return TK_EMOJI;
+                         }
                        }
 <St_Ref2>{SPCMD1}      |   
 <St_Ref2>{SPCMD2}      { /* special command */