Merge branch 'master' of github.com:doxygen/doxygen

15 files changed, 62 insertions, 25 deletions

diff --git a/src/context.cpp b/src/context.cpp
index 1933d43..8b7643a 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -8446,7 +8446,7 @@ TemplateVariant NamespaceMembersIndexContext::get(const char *name) const
 
 //------------------------------------------------------------------------
 
-//%% struct InheritanceGraph: a connected graph reprenting part of the overall interitance tree
+//%% struct InheritanceGraph: a connected graph reprenting part of the overall inheritance tree
 //%% {
 class InheritanceGraphContext::Private
 {
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 08b49ca..2dadc12 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -247,7 +247,7 @@ static void writeVectorBox(FTextStream &t,DiagramItem *di,
                            float x,float y,bool children=FALSE)
 {
   if (di->virtualness()==Virtual) t << "dashed\n";
-  t << " (" << di->label() << ") " << x << " " << y << " box\n";
+  t << " (" << convertToPSString(di->label()) << ") " << x << " " << y << " box\n";
   if (children) t << x << " " << y << " mark\n";
   if (di->virtualness()==Virtual) t << "solid\n";
 }
@@ -1297,7 +1297,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     for (;(di=rit.current());++rit)
     {
       done=di->isInList();
-      t << "(" << di->label() << ") cw\n";
+      t << "(" << convertToPSString(di->label()) << ") cw\n";
     }
   }
   QListIterator<DiagramRow> sit(*super);
@@ -1310,7 +1310,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     for (;(di=rit.current());++rit)
     {
       done=di->isInList();
-      t << "(" << di->label() << ") cw\n";
+      t << "(" << convertToPSString(di->label()) << ") cw\n";
     }
   }
 
diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp
index df64d66..bbffaf0 100644
--- a/src/dotgraph.cpp
+++ b/src/dotgraph.cpp
@@ -289,7 +289,7 @@ void DotGraph::writeGraphHeader(FTextStream &t,const QCString &title)
   {
     t << " // INTERACTIVE_SVG=YES\n";
   }
-  t << " // LATEX_PDF_SIZE\n"; // write placeholder for LaTeX PDF bounding box size repacement
+  t << " // LATEX_PDF_SIZE\n"; // write placeholder for LaTeX PDF bounding box size replacement
   if (Config_getBool(DOT_TRANSPARENT))
   {
     t << "  bgcolor=\"transparent\";" << endl;
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 798418f..184220c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2564,7 +2564,7 @@ static MemberDef *addVariableToFile(
           addMemberDocs(root,md,def,0,FALSE,root->spec);
           md->setRefItems(root->sli);
           // if md is a variable forward declaration and root is the definition that
-          // turn md into the defintion
+          // turn md into the definition
           if (!root->explicitExternal && md->isExternal())
           {
             md->setDeclFile(md->getDefFileName(),md->getDefLine(),md->getDefColumn());
diff --git a/src/fortrancode.l b/src/fortrancode.l
index d372299..303bbfb 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -521,7 +521,7 @@ static bool getGenericProcedureLink(const ClassDef *cd,
   return FALSE;
 }
 
-static bool getLink(UseSDict *usedict, // dictonary with used modules
+static bool getLink(UseSDict *usedict, // dictionary with used modules
                     const char *memberText,  // exact member text
 		    CodeOutputInterface &ol,
 		    const char *text)
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 9ff89e7..d7eefd6 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -1842,7 +1842,7 @@ static QCString extractFromParens(const QCString name)
   return extracted;
 }
 
-/*! remove non usefull spaces from bind statement */
+/*! remove unuseful spaces from bind statement */
 static QCString extractBind(const QCString name)
 {
   QCString parensPart = extractFromParens(name);
diff --git a/src/memberdef.h b/src/memberdef.h
index b200833..97bf819 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -239,7 +239,7 @@ class MemberDef : virtual public Definition
     virtual bool hasCallGraph() const = 0;
     virtual bool hasCallerGraph() const = 0;
     virtual bool visibleMemberGroup(bool hideNoHeader) const = 0;
-    // refrenced related members
+    // referenced related members
     virtual bool hasReferencesRelation() const = 0;
     virtual bool hasReferencedByRelation() const = 0;
 
diff --git a/src/portable.cpp b/src/portable.cpp
index 3d64638..c6e829d 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -457,7 +457,7 @@ bool portable_isAbsolutePath(const char *fileName)
 /**
  * Correct a possible wrong PATH variable
  *
- * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slahes.
+ * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slashes.
  */
 void portable_correct_path(void)
 {
diff --git a/src/pycode.l b/src/pycode.l
index a76129d..8cae0e2 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1316,7 +1316,7 @@ TARGET           ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT
     \\{B}\n                    { // line continuation
   		                 codifyLines(yytext);
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
   		                 codify(yytext);
                                }
     {STRINGPREFIX}?{TRIDOUBLEQUOTE} { // triple double quotes
@@ -1339,7 +1339,7 @@ TARGET           ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT
     \\{B}\n                    { // line continuation
   		                 codifyLines(yytext);
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
   		                 codify(yytext);
                                }
     {STRINGPREFIX}?{TRISINGLEQUOTE} { // triple single quotes
diff --git a/src/pyscanner.l b/src/pyscanner.l
index c6120fb..ee72c7c 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1570,7 +1570,7 @@ STARTDOCSYMS      "##"
       			  incLineNr();
 			  docBlock += yytext;
       			}
-    \\.		        { // espaced char
+    \\.		        { // escaped char
 			  docBlock += yytext;
       			}
     .			{
@@ -1605,7 +1605,7 @@ STARTDOCSYMS      "##"
       			         addToString(yytext);
       				 incLineNr();
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
       			         addToString(yytext);
                                }
     "\"\"\""		       { // triple double quotes
@@ -1628,7 +1628,7 @@ STARTDOCSYMS      "##"
       			         addToString(yytext);
       				 incLineNr();
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
       			         addToString(yytext);
                                }
     "'''"		       { // triple single quotes
diff --git a/src/scanner.l b/src/scanner.l
index 4ed4a62..50ebe5e 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -751,6 +751,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 %x	GCopyCurly
 %x	SkipUnionSwitch
 %x	Specialization
+%x	SpecializationSingleQuote
+%x	SpecializationDoubleQuote
 %x	FuncPtrInit
 %x	FuncFunc
 %x	FuncFuncEnd
@@ -2008,7 +2010,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
   					  //printf("PHP: adding use relation: %s\n",current->name.data());
                                           current->fileName = yyFileName; 
-                                          // add a using declaraton
+                                          // add a using declaration
   					  current->section=Entry::USINGDECL_SEC;
 					  current_root->copyToSubEntry(current);
                                           // also add it as a using directive
@@ -2769,7 +2771,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->name += yytext ;  
   					  addType();
 					}
-<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
+<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
 					  if (current->bodyLine==-1)
 					  {
 					    current->bodyLine=yyLineNr;
@@ -6145,6 +6147,19 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <Specialization>"typename"{BN}+		{ lineCount(); }
 <Specialization>"("			{ *specName += *yytext; roundCount++; }
 <Specialization>")"			{ *specName += *yytext; roundCount--; }
+
+<Specialization>"\\\\"			{ *specName += *yytext;}
+<Specialization>"\\'"			{ *specName += *yytext;}
+<Specialization>"\\\""			{ *specName += *yytext;}
+<Specialization>"'"			{ *specName += *yytext;BEGIN(SpecializationSingleQuote);}
+<Specialization>"\""			{ *specName += *yytext;BEGIN(SpecializationDoubleQuote);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *specName += *yytext;}
+<SpecializationSingleQuote>"\\'"        { *specName += *yytext;}
+<SpecializationSingleQuote>"'"          { *specName += *yytext; BEGIN(Specialization);}
+<SpecializationDoubleQuote>"\\\""       { *specName += *yytext;}
+<SpecializationDoubleQuote>"\""         { *specName += *yytext; BEGIN(Specialization);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *specName += *yytext;}
+
 <Specialization>.			{
   					  *specName += *yytext;
   					}
diff --git a/src/sortdict.h b/src/sortdict.h
index 52eccd3..0e0b5c1 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -128,7 +128,7 @@ class SDict
 
     /*! Appends an element to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -146,7 +146,7 @@ class SDict
 
     /*! Prepends an element to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -190,7 +190,7 @@ class SDict
       m_list->sort();
     }
     /*! Inserts a compound into the dictionary in a sorted way.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -470,7 +470,7 @@ class SIntDict
 
     /*! Appends a compound to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -488,7 +488,7 @@ class SIntDict
 
     /*! Prepend a compound to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -521,7 +521,7 @@ class SIntDict
     }
 
     /*! Inserts a compound into the dictionary in a sorted way.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
diff --git a/src/util.cpp b/src/util.cpp
index 85536ca..e1e9fb5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6183,6 +6183,26 @@ QCString convertToJSString(const char *s, bool applyTextDir)
   return convertCharEntitiesToUTF8(growBuf.get());
 }
 
+QCString convertToPSString(const char *s)
+{
+  static GrowBuf growBuf;
+  growBuf.clear();
+  if (s==0) return "";
+  const char *p=s;
+  char c;
+  while ((c=*p++))
+  {
+    switch (c)
+    {
+      case '(':  growBuf.addStr("\\("); break;
+      case ')': growBuf.addStr("\\)"); break;
+      default:   growBuf.addChar(c);   break;
+    }
+  }
+  growBuf.addChar(0);
+  return growBuf.get();
+}
+
 QCString convertToLaTeX(const QCString &s,bool insideTabbing,bool keepSpaces)
 {
   QGString result;
diff --git a/src/util.h b/src/util.h
index 4e6f622..cb2b957 100644
--- a/src/util.h
+++ b/src/util.h
@@ -291,6 +291,8 @@ QCString convertToDocBook(const char *s);
 
 QCString convertToJSString(const char *s, bool applyTextDir = true);
 
+QCString convertToPSString(const char *s);
+
 QCString getOverloadDocs();
 
 void addMembersToMemberGroup(/* in,out */ MemberList *ml,
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 9a817dc..ae10f4d 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -340,7 +340,7 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co
   {
     current->args=lastCompound->name;             // architecture name
   }
-  current->includeName=comp;                    // component/enity/configuration
+  current->includeName=comp;                    // component/entity/configuration
   int u=genLabels.find("|",1);
   if (u>0)
   {
@@ -579,7 +579,7 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
  * .....
  * library
  * package
- * enity zzz
+ * entity zzz
  * .....
  * and so on..
  */