Merge branch 'feature/bug_formula' of https://github.com/albert-github/doxygen into albert-github-feature/bug_formula

6 files changed, 10 insertions, 10 deletions

diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp
index 7d2f2d7..48bf388 100644
--- a/src/cmdmapper.cpp
+++ b/src/cmdmapper.cpp
@@ -55,7 +55,7 @@ CommandMap cmdMap[] =
   { "endverbatim",   CMD_ENDVERBATIM },
   { "endxmlonly",    CMD_ENDXMLONLY },
   { "exception",     CMD_EXCEPTION },
-  { "form",          CMD_FORMULA },
+  { "_fakeform",     CMD_FORMULA },
   { "htmlinclude",   CMD_HTMLINCLUDE },
   { "htmlonly",      CMD_HTMLONLY },
   { "image",         CMD_IMAGE },
diff --git a/src/commentscan.l b/src/commentscan.l
index 35001c3..ed321da 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -621,12 +621,12 @@ static QCString addFormula()
     f = new Formula(fText);
     Doxygen::formulaList->append(f);
     Doxygen::formulaDict->insert(fText,f);
-    formLabel.sprintf("\\form#%d",f->getId());
+    formLabel.sprintf("\\_fakeform#%d",f->getId());
     Doxygen::formulaNameDict->insert(formLabel,f);
   }
   else
   {
-    formLabel.sprintf("\\form#%d",f->getId());
+    formLabel.sprintf("\\_fakeform#%d",f->getId());
   }
   int i;
   for (i=0;i<formulaNewLines;i++) formLabel+="@_fakenl"; // add fake newlines to
diff --git a/src/docparser.cpp b/src/docparser.cpp
index e1501d4..cd05833 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -2223,7 +2223,7 @@ DocFormula::DocFormula(DocNode *parent,int id) :
 {
   m_parent = parent; 
   QCString formCmd;
-  formCmd.sprintf("\\form#%d",id);
+  formCmd.sprintf("\\_fakeform#%d",id);
   Formula *formula=Doxygen::formulaNameDict->find(formCmd);
   if (formula)
   {
@@ -2231,7 +2231,7 @@ DocFormula::DocFormula(DocNode *parent,int id) :
     m_name.sprintf("form_%d",m_id);
     m_text = formula->getFormulaText();
   }
-  else // wrong \form#<n> command
+  else // wrong \_fakeform#<n> command
   {
     warn_doc_error(g_fileName,doctokenizerYYlineno,"Wrong formula id %d",id);
     m_id = -1;
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 11861f8..38093e8 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -367,7 +367,7 @@ LINKMASK  [^ \t\n\r\\@<&${}]+("("[^\n)]*")")?({BLANK}*("const"|"volatile"){BLANK
 VERBATIM  "verbatim"{BLANK}*
 SPCMD1    {CMD}([a-z_A-Z][a-z_A-Z0-9]*|{VERBATIM}|"--"|"---")
 SPCMD2    {CMD}[\\@<>&$#%~".+=|-]
-SPCMD3    {CMD}form#[0-9]+
+SPCMD3    {CMD}_fakeform#[0-9]+
 SPCMD4    {CMD}"::"
 SPCMD5    {CMD}":"
 INOUT	  "inout"|"in"|"out"|("in"{BLANK}*","{BLANK}*"out")|("out"{BLANK}*","{BLANK}*"in")
@@ -582,9 +582,9 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
                              yylineno++; 
   		          }
 <St_Para>{SPCMD3}      {
-  			 g_token->name = "form";
+  			 g_token->name = "_fakeform";
 			 bool ok;
-			 g_token->id = QCString(yytext).right((int)yyleng-6).toInt(&ok);
+			 g_token->id = QCString(yytext).right((int)yyleng-11).toInt(&ok);
 			 ASSERT(ok);
 			 return TK_COMMAND_SEL();
   		       }
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d760678..1649e1c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9606,7 +9606,7 @@ void readFormulaRepository(QCString dir, bool cmp)
                 "formula.repository and from_* files from output directories.");
           }
           QCString formLabel;
-          formLabel.sprintf("\\form#%d",f->getId());
+          formLabel.sprintf("\\_fakeform#%d",f->getId());
           if (formLabel != formName)
           {
             term("discrepancy between formula repositories! Remove "
diff --git a/src/formula.cpp b/src/formula.cpp
index 63323db..45960c7 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -334,7 +334,7 @@ void FormulaList::generateBitmaps(const char *path)
     FTextStream t(&f);
     for (fli.toFirst();(formula=fli.current());++fli)
     {
-      t << "\\form#" << formula->getId() << ":" << formula->getFormulaText() << endl;
+      t << "\\_fakeform#" << formula->getId() << ":" << formula->getFormulaText() << endl;
     }
     f.close();
   }