Merge branch 'master' into feature/issue_11702

Author: albert-github

CMakeLists.txt

@@ -92,7 +92,7 @@ if(NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
     set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
   endif()
   if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
-    set(MACOS_VERSION_MIN 11.0) # needs Qt
+    set(MACOS_VERSION_MIN 13.0) # needs Qt6
   endif()
 endif()
 

src/commentcnv.l

@@ -1624,7 +1624,7 @@ static void replaceCommentMarker(yyscan_t yyscanner,std::string_view s)
   }
   // copy comment line to output
   yyextra->outBuf+=s.substr(p);
-  yyextra->col+=s.substr(p).length();
+  yyextra->col+=static_cast<int>(s.substr(p).length());
 }
 
 static inline int computeIndent(const char *s)
@@ -1849,7 +1849,7 @@ static void insertCommentStart(yyscan_t yyscanner)
   if (static_cast<int>(marker.length())<=markerSpace && !yyextra->firstIncludeLine)
   {
     copyToOutput(yyscanner,marker);
-    i+=marker.length();
+    i+=static_cast<int>(marker.length());
   }
   for (;i<contentCol;i++)
   {

src/latexgen.cpp

@@ -2520,7 +2520,7 @@ void filterLatexString(TextStream &t,const QCString &str,
         default:
                    //if (!insideTabbing && forceBreaks && c!=' ' && *p!=' ')
                    if (!insideTabbing &&
-                       ((c>='A' && c<='Z' && pc!=' ' && !(pc>='A' && pc <= 'Z') && pc!='\0' && *p) || (c==':' && pc!=':') || (pc=='.' && isId(c)))
+                       ((c>='A' && c<='Z' && pc!=' ' && !(pc>='A' && pc <= 'Z') && pc!='\0' && *p) || (pc=='.' && isId(c)))
                       )
                    {
                      t << "\\+";
@@ -2533,6 +2533,10 @@ void filterLatexString(TextStream &t,const QCString &str,
                    {
                      t << static_cast<char>(c);
                    }
+                   if (!insideTabbing && ((c==':' && *p!=':') || c=='/'))
+                   {
+                     t << "\\+";
+                   }
       }
     }
     pc = c;

src/markdown.cpp

@@ -1755,7 +1755,7 @@ int Markdown::Private::processCodeSpan(std::string_view data,size_t offset)
     if (nb>=3) // found ``` that is not at the start of the line, keep it as-is.
     {
       out+=data.substr(0,nb);
-      return nb;
+      return static_cast<int>(nb);
     }
     return 0;  // no matching delimiter
   }

src/regex.cpp

@@ -286,7 +286,7 @@ void Ex::Private::compile()
           prevTokenPos = tokenPos;
           addToken(PToken(PToken::Kind::BeginCapture));
           size_t id = ++nextCaptureId; // groups start at 1, 0 is whole match
-          data.back().setValue(id);
+          data.back().setValue(static_cast<uint16_t>(id));
           captureStack.push_back(id);
         }
         break;
@@ -301,7 +301,7 @@ void Ex::Private::compile()
           size_t id = captureStack.back();
           captureStack.pop_back();
           addToken(PToken(PToken::Kind::EndCapture));
-          data.back().setValue(id);
+          data.back().setValue(static_cast<uint16_t>(id));
         }
         break;
       case '[': // character class

testing/CMakeLists.txt

@@ -1,7 +1,7 @@
 # run all tests sequentially (keep for backward compatibility)
 add_custom_target(tests
   COMMENT "Running doxygen tests..."
-  COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --xmlxsd --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+  COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
   DEPENDS doxygen ${update_doxmlparser_dependency}
 )
 
@@ -15,6 +15,6 @@ foreach(TEST_FILE ${TEST_FILES})
   string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
   # add a test target for each test
   add_test(NAME ${TEST_NAME}
-    COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --xmlxsd --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+    COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
   )
 endforeach()

testing/runtests.py

@@ -79,16 +79,39 @@ def __init__(self,args,test):
             self.test_out = self.args.outputdir+'/test_output_'+self.test_id
         self.prepare_test()
 
-    def compare_ok(self,got_file,expected_file,name):
+    # Compares 'got_file' against 'expected_file'.
+    # Returns (True,Msg) if there is a difference or one of the files does not exist and (False,'') otherwise
+    def compare_ok(self, got_file, expected_file):
         if not os.path.isfile(got_file):
-            return (True,'%s absent' % got_file)
-        elif not os.path.isfile(expected_file):
-            return (True,'%s absent' % expected_file)
-        else:
-            diff = xpopen('diff -b -w -u %s %s' % (got_file,expected_file))
+            return (True, f'{got_file} absent')
+        if not os.path.isfile(expected_file):
+            return (True, f'{expected_file} absent')
+
+        def _write_filtered_tmp(src_path, tmp_path):
+            # Read, split on tags to add newlines, drop empty lines, and write to tmp
+            with xopen(src_path, 'r') as f, xopen(tmp_path, 'w') as out_file:
+                filtered = [line for line in f.read().
+                            replace("<", "\n<").replace(">", ">\n").splitlines() if line.strip()]
+                out_file.write('\n'.join(filtered)+'\n')
+
+        got_file_tmp      = got_file + "_got"
+        expected_file_tmp = got_file + "_ref"
+
+        try:
+            for src, tmp in ((got_file, got_file_tmp), (expected_file, expected_file_tmp)):
+                _write_filtered_tmp(src, tmp)
+
+            diff = xpopen(f'diff -b -w -u {got_file_tmp} {expected_file_tmp}')
             if diff and not diff.startswith("No differences"):
-                return (True,'Difference between generated output and reference:\n%s' % diff)
-        return (False,'')
+                return (True, f'Difference between generated output and reference:\n{diff}')
+            return (False, '')
+        finally:
+            # Ensure cleanup even if diff or write fails
+            for tmp in (got_file_tmp, expected_file_tmp):
+                try:
+                    os.remove(tmp)
+                except OSError:
+                    pass
 
     def cleanup_xmllint(self,errmsg):
         msg = errmsg.split('\n')
@@ -328,7 +351,7 @@ def perform_test(self,testmgr):
                     with xopen(out_file,'w') as f:
                         print(data,file=f)
                     ref_file='%s/%s/%s' % (self.args.inputdir,self.test_id,check)
-                    (failed_xml,xml_msg) = self.compare_ok(out_file,ref_file,self.test_name)
+                    (failed_xml,xml_msg) = self.compare_ok(out_file,ref_file)
                     if failed_xml:
                         msg+= (xml_msg,)
                         break