Further improve quote handling

Author: doxygen

doc/markdown.dox

@@ -693,6 +693,10 @@ added for backward compatibility reasons.
 In case you want to have single quotes inside a code span, don't use
 one backtick but two backticks around the code span.
 
+Double backticks are also ended by double quotes in the same way.
+
+    A ``cool'' word in a ``nice'' sentence.
+
 \subsection mddox_lists Lists Extensions
 
 With Markdown two lists separated by an empty line are joined together into

src/commentcnv.l

@@ -760,6 +760,14 @@ SLASHopt [/]*
                                        }
                                      }
                                    }
+<VerbatimCode>"''"                 {
+                                     copyToOutput(yyscanner,yytext,yyleng);
+                                     if (yyextra->blockName=="``") // support for ``text''
+                                     {
+                                       yyextra->inVerbatim=false;
+                                       BEGIN(yyextra->lastCommentContext);
+                                     }
+                                   }
 <VerbatimCode>"'"                  {
                                      copyToOutput(yyscanner,yytext,yyleng);
                                      if (yyextra->blockName=="`") // support for `text'

src/markdown.cpp

@@ -1638,14 +1638,44 @@ int Markdown::Private::processCodeSpan(std::string_view data,size_t offset)
     nb++;
   }
 
-  /* finding the next delimiter */
+  /* finding the next delimiter with the same amount of backticks */
   size_t i = 0;
   char pc = '`';
-  for (end=nb; end<size && i<nb; end++)
+  for (end=nb; end<size; end++)
   {
+    //AUTO_TRACE_ADD("c={} nb={} i={} size={}",data[end],nb,i,size);
     if (data[end]=='`')
     {
       i++;
+      if (nb==1) // `...`
+      {
+        if (end<size && data[end+1]=='`') // skip over `` inside `...`
+        {
+          AUTO_TRACE_ADD("case1.1");
+          // skip
+          end++;
+          i=0;
+        }
+        else // normal end of `...`
+        {
+          AUTO_TRACE_ADD("case1.2");
+          break;
+        }
+      }
+      else if (i==nb) // ``...``
+      {
+        if (end<size && data[end+1]=='`') // do greedy match
+        {
+          // skip this quote and use the next one to terminate the sequence, e.g. ``X`Y```
+          i--;
+          AUTO_TRACE_ADD("case2.1");
+        }
+        else // normal end of ``...``
+        {
+          AUTO_TRACE_ADD("case2.2");
+          break;
+        }
+      }
     }
     else if (data[end]=='\n')
     {
@@ -1658,14 +1688,22 @@ int Markdown::Private::processCodeSpan(std::string_view data,size_t offset)
       pc = '\n';
       i = 0;
     }
-    else if (data[end]=='\'' && nb==1 && (end==size-1 || (end+1<size && !isIdChar(data[end+1]))))
+    else if (data[end]=='\'' && nb==1 && (end==size-1 || (end+1<size && data[end+1]!='\'' && !isIdChar(data[end+1]))))
     { // look for quoted strings like 'some word', but skip strings like `it's cool`
       out+="&lsquo;";
       out+=data.substr(nb,end-nb);
       out+="&rsquo;";
       AUTO_TRACE_EXIT("quoted end={}",end+1);
       return static_cast<int>(end+1);
     }
+    else if (data[end]=='\'' && nb==2 && end<size-1 && data[end+1]=='\'')
+    { // look for '' to match a ``
+      out+="&ldquo;";
+      out+=data.substr(nb,end-nb);
+      out+="&rdquo;";
+      AUTO_TRACE_EXIT("double quoted end={}",end+1);
+      return static_cast<int>(end+2);
+    }
     else
     {
       if (data[end]!=' ') pc = data[end];

src/scanner.l

@@ -7338,7 +7338,14 @@ NONLopt [^\n]*
                                             yyextra->docBlock << yytext;
                                           }
                                         }
-<DocCopyBlock>"'"/[^a-z_A-Z0-9-]        {
+<DocCopyBlock>"''"/[^a-z_A-Z0-9-]       {
+                                          if (endVerbatimBlock(yyscanner,"``",2))
+                                          {
+                                            BEGIN(DocBlock);
+                                          }
+                                          yyextra->docBlock << yytext;
+                                        }
+<DocCopyBlock>"'"/[^'a-z_A-Z0-9-]       {
                                           if (endVerbatimBlock(yyscanner,"`",1))
                                           {
                                             BEGIN(DocBlock);

templates/html/doxygen.css

@@ -338,6 +338,7 @@ pre.fragment {
 span.tt {
         white-space: pre;
 	font-family: var(--font-family-monospace);
+	background-color: var(--fragment-background-color);
 }
 
 .clipboard {

testing/110/indexpage.xml

@@ -12,8 +12,13 @@
  Text with <computeroutput>double</computeroutput> backtick. <linebreak/>
  Text with <computeroutput>double and `single` form</computeroutput> of backticks. <linebreak/>
  Text with <computeroutput>double backtick `ending`</computeroutput> in triple backtick. <linebreak/>
+ Text with <computeroutput>double backtick `` inside single</computeroutput> backtick. <linebreak/>
  Text with `escaped` backticks. <linebreak/>
  Text with triple ``` backtick not at the start of the line. <linebreak/>
+ Text with <computeroutput>X``Y</computeroutput> embedded double backticks inside backticks. <linebreak/>
+ Text in double quotes <ldquo/>left`right<rdquo/> with embedded backtick. <linebreak/>
+ Text in double quotes <ldquo/>left'right<rdquo/> with embedded single quote. <linebreak/>
+ Text in single quotes <lsquo/>left''right<rsquo/> with embedded double quote. <linebreak/>
  <programlisting><codeline><highlight class="normal">Text<sp/>inside<sp/>triple<sp/>backticks</highlight></codeline><codeline><highlight class="normal">Nested<sp/>`single`<sp/>backtick</highlight></codeline><codeline><highlight class="normal">Nested<sp/>``</highlight><highlight class="keywordtype">double</highlight><highlight class="normal">``<sp/>backtick</highlight></codeline></programlisting> More text after triple backtick section. </para>
     </detaileddescription>
     <location file="110_backticks.dox"/>

testing/110_backticks.dox

@@ -7,8 +7,13 @@ Text `it's cool`. with embedded '
 Text with ``double`` backtick.  
 Text with ``double and `single` form`` of backticks.  
 Text with ``double backtick `ending``` in triple backtick.  
+Text with `double backtick `` inside single` backtick.  
 Text with \`escaped\` backticks.  
 Text with triple ``` backtick not at the start of the line.  
+Text with `X``Y` embedded double backticks inside backticks.  
+Text in double quotes ``left`right'' with embedded backtick.  
+Text in double quotes ``left'right'' with embedded single quote.  
+Text in single quotes `left''right' with embedded double quote.  
 ```
 Text inside triple backticks
 Nested `single` backtick