Changed refiltering to forced use of insideTabbing

1 files changed, 5 insertions, 37 deletions

diff --git a/src/util.cpp b/src/util.cpp
index 0a10e74..0f27794 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6927,37 +6927,11 @@ void filterLatexString(FTextStream &t,const char *str,
   }
 }
 
-static void reFilterLatexString(FTextStream &t,const char *str)
-{
-  if (str==0) return;
-  const unsigned char *p=(const unsigned char *)str;
-  unsigned char c;
-  unsigned char pc='\0';
-  while (*p)
-  {
-    c=*p++;
-
-    switch(c)
-    {
-      case '\\':
-        if (*p == '+') p++;
-        else t << '\\';
-        break;
-      default:
-        t << (char)c;
-        break;
-    }
-    pc = c;
-  }
-}
-
-QCString latexEscapeLabelName(const char *s,bool insideTabbing)
+QCString latexEscapeLabelName(const char *s)
 {
   QGString result;
-  QGString result1;
   QCString tmp(qstrlen(s)+1);
   FTextStream t(&result);
-  FTextStream t1(&result1);
   const char *p=s;
   char c;
   int i;
@@ -6983,20 +6957,14 @@ QCString latexEscapeLabelName(const char *s,bool insideTabbing)
           p++;
         }
         tmp[i]=0;
-        filterLatexString(t,tmp.data(),insideTabbing);
+        filterLatexString(t,tmp,TRUE);
         break;
     }
   }
-  if (!insideTabbing)
-  {
-    reFilterLatexString(t1,result.data());
-    return result1.data();
-  }
-  else
-    return result.data();
+  return result.data();
 }
 
-QCString latexEscapeIndexChars(const char *s,bool insideTabbing)
+QCString latexEscapeIndexChars(const char *s)
 {
   QGString result;
   QCString tmp(qstrlen(s)+1);
@@ -7027,7 +6995,7 @@ QCString latexEscapeIndexChars(const char *s,bool insideTabbing)
           p++;
         }
         tmp[i]=0;
-        filterLatexString(t,tmp.data(),insideTabbing);
+        filterLatexString(t,tmp.data(),TRUE);
         break;
     }
   }