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

Author: doxygen

addon/doxywizard/config_doxyw.l

@@ -19,7 +19,7 @@
 %{
 
 /*
- *	includes
+ * includes
  */
 #include "config.h"
 #include "input.h"
@@ -46,7 +46,7 @@
 
 /* -----------------------------------------------------------------
  *
- *	static variables
+ * static variables
  */
 
 struct ConfigFileState
@@ -77,8 +77,8 @@ static const char *stateToString(int state);
 
 /* -----------------------------------------------------------------
  */
-#undef	YY_INPUT
-#define	YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
+#undef  YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
 
 static int yyread(char *buf,int maxSize)
 {
@@ -334,7 +334,7 @@ static void readIncludeFile(const QString &incName)
   if (g_includeDepth==MAX_INCLUDE_DEPTH)
   {
     config_err("maximum include depth (%d) reached, %s is not included.",
-	MAX_INCLUDE_DEPTH,qPrintable(incName));
+               MAX_INCLUDE_DEPTH,qPrintable(incName));
   }
 
   QString inc = incName;
@@ -722,7 +722,7 @@ static void upgradeConfig(const QHash<QString,Input*> &options)
         bool classGraph    = InputBool::convertToBool(v3,isValid3);
         if (isValid1 && isValid2 && isValid3 && !classDiagrams && !haveDot && classGraph)
         {
-   	  config_warn("Changing CLASS_GRAPH option to TEXT because obsolete option CLASS_DIAGRAM was found and set to NO.\n");
+          config_warn("Changing CLASS_GRAPH option to TEXT because obsolete option CLASS_DIAGRAM was found and set to NO.\n");
           optClassGraph->setValue(QString::fromLatin1("TEXT"));
         }
       }
@@ -800,10 +800,10 @@ void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
       while (!(c=*p++).isNull() && !needsEscaping)
       {
         needsEscaping = (c==QChar::fromLatin1(' ')  ||
-	                 c==QChar::fromLatin1(',') ||
-	                 c==QChar::fromLatin1('\n') ||
-		         c==QChar::fromLatin1('\t') ||
-		         c==QChar::fromLatin1('"'));
+                         c==QChar::fromLatin1(',')  ||
+                         c==QChar::fromLatin1('\n') ||
+                         c==QChar::fromLatin1('\t') ||
+                         c==QChar::fromLatin1('"'));
       }
       p=s.data();
       while (!(c=*p++).isNull() && !needsHashEscaping)
@@ -820,15 +820,27 @@ void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
       p=s.data();
       while (!p->isNull())
       {
-	if (*p   ==QChar::fromLatin1(' ') &&
-	   *(p+1)==QChar::fromLatin1('\0')) break; // skip inserted space at the end
-	if (*p   ==QChar::fromLatin1('"')) t << "\\"; // escape quotes
-	t << *p++;
+        if (*p   ==QChar::fromLatin1(' ') &&
+           *(p+1)==QChar::fromLatin1('\0')) break; // skip inserted space at the end
+        if (*p   ==QChar::fromLatin1('"')) t << "\\"; // escape quotes
+        if (*p   ==QChar::fromLatin1('<')) t << "&lt;";
+        else if (*p   ==QChar::fromLatin1('>')) t << "&gt;";
+        else if (*p   ==QChar::fromLatin1('&')) t << "&amp;";
+        else t << *p;
+        p++;
       }
     }
     else
     {
-      t << s;
+      p=s.data();
+      while (!p->isNull())
+      {
+        if (*p   ==QChar::fromLatin1('<')) t << "&lt;";
+        else if (*p   ==QChar::fromLatin1('>')) t << "&gt;";
+        else if (*p   ==QChar::fromLatin1('&')) t << "&amp;";
+        else t << *p;
+        p++;
+      }
     }
     if (needsHashEscaping || needsEscaping)
     {

doc/changelog.dox

@@ -12,6 +12,7 @@
 will insert defaults for elements that are missing in the user defined layout file. This allows for the introduction of new elements, without having
 to update the user defined layout files to make them appear. For older Doxygen
 or layout versions, missing elements are still treated as being invisible as before.
+</li>
 </ul>
 
 <h3>Features</h3>

doc/markdown.dox

@@ -453,8 +453,8 @@ which will produce:
 int func(int a,int b) { return a*b; }
 ~~~~~~~~~~~~~~~
 
-The dot is optional, the curly braces are optional when the that language name begins with a
-alphabetical character and further characters are alphanumerical characters.
+The dot is optional, the curly braces are optional when the that language name begins with an
+alphabetical character and further characters are alphanumerical characters or a plus sign.
 
 Another way to denote fenced code blocks is to use 3 or more backticks (```):
 

src/doctokenizer.l

@@ -180,6 +180,7 @@ BLANK     [ \t\r]
 BLANKopt  {BLANK}*
 ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 LABELID   [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]*
+CODEID    [a-zA-Z][a-zA-Z0-9+]*
 PHPTYPE   [?]?[\\:a-z_A-Z0-9\x80-\xFF\-]+
 CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?]
 CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/\?]
@@ -745,13 +746,13 @@ SHOWDATE ([0-9]{4}"-"[0-9]{1,2}"-"[0-9]{1,2})?({WS}*[0-9]{1,2}":"[0-9]{1,2}(":"[
                            return Token::make_TK_NEWPARA();
                          }
                        }
-<St_CodeOpt>{BLANK}*"{"(".")?{LABELID}"}" {
+<St_CodeOpt>{BLANK}*"{"(".")?{CODEID}"}" {
                          yyextra->token.name = yytext;
                          int i=yyextra->token.name.find('{'); /* } to keep vi happy */
                          yyextra->token.name = yyextra->token.name.mid(i+1,yyextra->token.name.length()-i-2);
                          BEGIN(St_Code);
                        }
-<St_iCodeOpt>{BLANK}*"{"(".")?{LABELID}"}" {
+<St_iCodeOpt>{BLANK}*"{"(".")?{CODEID}"}" {
                          yyextra->token.name = yytext;
                          int i=yyextra->token.name.find('{'); /* } to keep vi happy */
                          yyextra->token.name = yyextra->token.name.mid(i+1,yyextra->token.name.length()-i-2);

src/markdown.cpp

@@ -284,7 +284,7 @@ static QCString escapeSpecialChars(const QCString &s)
 }
 
 /** helper function to convert presence of left and/or right alignment markers
- *  to a alignment value
+ *  to an alignment value
  */
 static Alignment markersToAlignment(bool leftMarker,bool rightMarker)
 {
@@ -2231,7 +2231,7 @@ static bool isFencedCodeBlock(std::string_view data,size_t refIndent,
   AUTO_TRACE("data='{}' refIndent={}",Trace::trunc(data),refIndent);
   const char dot = '.';
   auto isAlphaChar  = [ ](char c) { return (c>='A' && c<='Z') || (c>='a' && c<='z'); };
-  auto isAlphaNChar = [ ](char c) { return (c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9'); };
+  auto isAlphaNChar = [ ](char c) { return (c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9') || (c=='+'); };
   auto isLangChar   = [&](char c) { return c==dot || isAlphaChar(c); };
   // rules: at least 3 ~~~, end of the block same amount of ~~~'s, otherwise
   // return FALSE