fix: [mdx]object data html (#1602)

* fix: mdx object data subsitition --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
xiaoyifang · Jun 21, 2024 · 21aeb27 · 21aeb27
1 parent c8e10b6
commit 21aeb27
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/common/globalregex.cc b/src/common/globalregex.cc
@@ -25,7 +25,7 @@ QRegularExpression Ftx::token( R"((".*?")|([\w\W\+\-]+))",
 //mdx
 
 //<audio src="xxx"> is also a valid url.
-QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source|audio|video)(?:\s+[^>]+|\s*)>))",
+QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source|audio|video|object)(?:\s+[^>]+|\s*)>))",
                                     QRegularExpression::CaseInsensitiveOption );
 QRegularExpression Mdx::wordCrossLink( R"(([\s"']href\s*=)\s*(["'])entry://([^>#]*?)((?:#[^>]*?)?)\2)",
                                        QRegularExpression::CaseInsensitiveOption );
@@ -58,6 +58,10 @@ QRegularExpression Mdx::srcRe2(
 QRegularExpression Mdx::srcset( R"((?<before>[\s]srcset\s*=\s*["'])\s*(?<text>[\s\S]*)(?<after>["']))",
                                 QRegularExpression::CaseInsensitiveOption );
 
+// matches srcset in <object data="text">
+QRegularExpression Mdx::objectdata( R"((?<before>[\s]data\s*=\s*["'])\s*(?<text>[\s\S]*)(?<after>["']))",
+                                    QRegularExpression::CaseInsensitiveOption );
+
 QRegularExpression Mdx::links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))", QRegularExpression::CaseInsensitiveOption );
 
 QRegularExpression Mdx::fontFace( R"((?:url\s*\(\s*\"(.*?)\"\s*)\))",

diff --git a/src/common/globalregex.hh b/src/common/globalregex.hh
@@ -39,6 +39,7 @@ public:
   static QRegularExpression srcRe;
   static QRegularExpression srcRe2;
   static QRegularExpression srcset;
+  static QRegularExpression objectdata;
 
   static QRegularExpression links;
   static QRegularExpression fontFace;

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
@@ -1008,6 +1008,21 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
                            match.captured( "before" ) % srcsetNewText.join( ',' ) % match.captured( "after" ) );
         }
       }
+
+      if ( linkType.compare( "object" ) == 0 ) {
+        match = RX::Mdx::objectdata.match( newLink );
+        if ( match.hasMatch() ) {
+          auto srcsetOriginalText = match.captured( "text" );
+          QString srcsetNewText;
+          if ( !srcsetOriginalText.contains( "//" ) ) {
+            srcsetNewText = QString( R"(bres://%1/%2)" ).arg( id, srcsetOriginalText );
+          }
+
+          newLink.replace( match.capturedStart(),
+                           match.capturedLength(),
+                           match.captured( "before" ) % srcsetNewText % match.captured( "after" ) );
+        }
+      }
     }
 
     if ( !newLink.isEmpty() ) {