Fixed problems with emoji handling and added a test case for it

doxygen · Dec 25, 2018 · 348a8cc · 348a8cc
1 parent 0591146
commit 348a8cc
Show file tree

Hide file tree

Showing 4 changed files with 2,997 additions and 2 deletions.
diff --git a/src/docparser.cpp b/src/docparser.cpp
@@ -1791,8 +1791,8 @@ DocEmoji::DocEmoji(DocNode *parent,const QCString &symName) :
   int len=locSymName.length();
   if (len>0)
   {
-    if (locSymName.at(0)!=':')     locSymName.prepend(":");
     if (locSymName.at(len-1)!=':') locSymName.append(":");
+    if (locSymName.at(0)!=':')     locSymName.prepend(":");
   }
   m_symName = locSymName;
   m_index = EmojiEntityMapper::instance()->symbol2index(m_symName);

diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
@@ -247,7 +247,9 @@ void LatexDocVisitor::visit(DocEmoji *s)
   if (!emojiName.isEmpty())
   {
     QCString imageName=emojiName.mid(1,emojiName.length()-2); // strip : at start and end
-    m_t << "\\doxygenemoji{" << emojiName << "}{" << imageName << "}";
+    m_t << "\\doxygenemoji{";
+    filter(emojiName);
+    m_t << "}{" << imageName << "}";
   }
   else
   {