Release-1.8.1.2

1 files changed, 73 insertions, 3 deletions

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 4beb405..876fede 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -1526,6 +1526,73 @@ DocSymbol::SymType DocSymbol::decodeSymbol(const QCString &symName,char *letter)
   else if (symName==" ")  return DocSymbol::Nbsp;
   else if (symName=="Æ") return DocSymbol::AElig;
   else if (symName=="æ") return DocSymbol::Aelig;
+  else if (symName=="Γ")     return DocSymbol::GrkGamma;
+  else if (symName=="Δ")     return DocSymbol::GrkDelta;
+  else if (symName=="Θ")     return DocSymbol::GrkTheta;
+  else if (symName=="Λ")    return DocSymbol::GrkLambda;
+  else if (symName=="Ξ")        return DocSymbol::GrkXi;
+  else if (symName=="Π")        return DocSymbol::GrkPi;
+  else if (symName=="Σ")     return DocSymbol::GrkSigma;
+  else if (symName=="Υ")   return DocSymbol::GrkUpsilon;
+  else if (symName=="Φ")       return DocSymbol::GrkPhi;
+  else if (symName=="Ψ")       return DocSymbol::GrkPsi;
+  else if (symName=="Ω")     return DocSymbol::GrkOmega;
+  else if (symName=="α")     return DocSymbol::Grkalpha;
+  else if (symName=="β")      return DocSymbol::Grkbeta;
+  else if (symName=="γ")     return DocSymbol::Grkgamma;
+  else if (symName=="δ")     return DocSymbol::Grkdelta;
+  else if (symName=="ε")   return DocSymbol::Grkepsilon;
+  else if (symName=="ζ")      return DocSymbol::Grkzeta;
+  else if (symName=="η")       return DocSymbol::Grketa;
+  else if (symName=="θ")     return DocSymbol::Grktheta;
+  else if (symName=="ι")      return DocSymbol::Grkiota;
+  else if (symName=="κ")     return DocSymbol::Grkkappa;
+  else if (symName=="λ")    return DocSymbol::Grklambda;
+  else if (symName=="μ")        return DocSymbol::Grkmu;
+  else if (symName=="ν")        return DocSymbol::Grknu;
+  else if (symName=="ξ")        return DocSymbol::Grkxi;
+  else if (symName=="π")        return DocSymbol::Grkpi;
+  else if (symName=="ρ")       return DocSymbol::Grkrho;
+  else if (symName=="σ")     return DocSymbol::Grksigma;
+  else if (symName=="τ")       return DocSymbol::Grktau;
+  else if (symName=="υ")   return DocSymbol::Grkupsilon;
+  else if (symName=="φ")       return DocSymbol::Grkphi;
+  else if (symName=="χ")       return DocSymbol::Grkchi;
+  else if (symName=="ψ")       return DocSymbol::Grkpsi;
+  else if (symName=="ω")     return DocSymbol::Grkomega;
+  else if (symName=="ς")    return DocSymbol::Grkvarsigma;
+  else if (symName=="§")      return DocSymbol::Section;
+  else if (symName=="°")       return DocSymbol::Degree;
+  else if (symName=="′")     return DocSymbol::Prime;
+  else if (symName=="″")     return DocSymbol::DoublePrime;
+  else if (symName=="∞")     return DocSymbol::Infinity;
+  else if (symName=="∅")     return DocSymbol::EmptySet;
+  else if (symName=="±")    return DocSymbol::PlusMinus;
+  else if (symName=="×")     return DocSymbol::Times;
+  else if (symName=="−")     return DocSymbol::Minus;
+  else if (symName=="⋅")      return DocSymbol::CenterDot;
+  else if (symName=="∂")      return DocSymbol::Partial;
+  else if (symName=="∇")     return DocSymbol::Nabla;
+  else if (symName=="√")     return DocSymbol::SquareRoot;
+  else if (symName=="⊥")      return DocSymbol::Perpendicular;
+  else if (symName=="∑")       return DocSymbol::Sum;
+  else if (symName=="∫")       return DocSymbol::Integral;
+  else if (symName=="∏")      return DocSymbol::Product;
+  else if (symName=="∼")       return DocSymbol::Similar;
+  else if (symName=="≈")     return DocSymbol::Approx;
+  else if (symName=="≠")        return DocSymbol::NotEqual;
+  else if (symName=="≡")     return DocSymbol::Equivalent;
+  else if (symName=="∝")      return DocSymbol::Proportional;
+  else if (symName=="≤")        return DocSymbol::LessEqual;
+  else if (symName=="≥")        return DocSymbol::GreaterEqual;
+  else if (symName=="←")      return DocSymbol::LeftArrow;
+  else if (symName=="→")      return DocSymbol::RightArrow;
+  else if (symName=="∈")      return DocSymbol::SetIn;
+  else if (symName=="∉")     return DocSymbol::SetNotIn;
+  else if (symName=="⌈")     return DocSymbol::LeftCeil;
+  else if (symName=="⌉")     return DocSymbol::RightCeil;
+  else if (symName=="⌊")    return DocSymbol::LeftFloor;
+  else if (symName=="⌋")    return DocSymbol::RightFloor;
   else if (l==6 && symName.right(4)=="uml;")  
   {
     *letter=symName.at(1);
@@ -5069,7 +5136,7 @@ int DocPara::handleStartCode()
     if (g_token->verb.at(i)=='\n') li=i+1;
     i++;
   }
-  m_children.append(new DocVerbatim(this,g_context,g_token->verb.mid(li),DocVerbatim::Code,g_isExample,g_exampleName,lang));
+  m_children.append(new DocVerbatim(this,g_context,stripIndentation(g_token->verb.mid(li)),DocVerbatim::Code,g_isExample,g_exampleName,lang));
   if (retval==0) warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: code section ended without end marker");
   doctokenizerYYsetStatePara();
   return retval;
@@ -5153,6 +5220,9 @@ int DocPara::handleCommand(const QCString &cmdName)
     case CMD_HASH:
       m_children.append(new DocSymbol(this,DocSymbol::Hash));
       break;
+    case CMD_PIPE:
+      m_children.append(new DocSymbol(this,DocSymbol::Pipe));
+      break;
     case CMD_DCOLON:
       m_children.append(new DocSymbol(this,DocSymbol::DoubleColon));
       break;
@@ -5607,7 +5677,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
     case HTML_PRE:
       handleStyleEnter(this,m_children,DocStyleChange::Preformatted,&g_token->attribs);
       setInsidePreformatted(TRUE);
-      //doctokenizerYYsetInsidePre(TRUE);
+      doctokenizerYYsetInsidePre(TRUE);
       break;
     case HTML_P:
       retval=TK_NEWPARA;
@@ -6011,7 +6081,7 @@ int DocPara::handleHtmlEndTag(const QCString &tagName)
     case HTML_PRE:
       handleStyleLeave(this,m_children,DocStyleChange::Preformatted,"pre");
       setInsidePreformatted(FALSE);
-      //doctokenizerYYsetInsidePre(FALSE);
+      doctokenizerYYsetInsidePre(FALSE);
       break;
     case HTML_P:
       retval=TK_NEWPARA;