Merge branch 'main' into menu-4

Author: linawolf

packages/guides-restructured-text/src/RestructuredText/Parser/InlineLexer.php

@@ -59,7 +59,6 @@ protected function getCatchablePatterns(): array
         return [
             '\\\\``', // must be a separate case, as the next pattern would split in "\`" + "`", causing it to become a intepreted text
             '\\\\[\s\S]', // Escaping hell... needs escaped slash in regex, but also in php.
-            ExternalReferenceResolver::SUPPORTED_SCHEMAS . ':[-a-zA-Z0-9()@:%_\\+.~#?&\\/=]*[-a-zA-Z0-9()@%_\\+~#&\\/=]', // standalone hyperlinks
             '\\S+@\\S+\\.\\S+',
             '[a-z0-9-]+_{2}', //Inline href.
             '[a-z0-9-]+_{1}(?=[\s\.+]|$)', //Inline href.
@@ -76,6 +75,7 @@ protected function getCatchablePatterns(): array
             '|',
             '\\*\\*',
             '\\*',
+            '\b(?<!:)[a-z0-9\\.\-+]{2,}:[-a-zA-Z0-9()@:%_\\+.~#?&\\/=]*[-a-zA-Z0-9()@%_\\+~#&\\/=]', // standalone hyperlinks
         ];
     }
 

tests/Functional/tests/guilabel/guilabel.html

@@ -1,3 +1,3 @@
 <p>Lorem ipsum dolor sit amet <span class="guilabel">Foo Bar</span>.</p>
-<p>Lorem ipsum dolor sit amet<span class="guilabel">Foo Bar</span>.</p>
+<p>Lorem ipsum dolor sit amet:guilabel:<code>Foo Bar</code>.</p>
 <p>Lorem ipsum dolor sit amet <span class="guilabel">Foo-Bar</span>.</p>

tests/Functional/tests/guilabel/guilabel.rst

@@ -3,4 +3,4 @@ Lorem ipsum dolor sit amet :guilabel:`Foo Bar`.
 
 Lorem ipsum dolor sit amet:guilabel:`Foo Bar`.
 
-Lorem ipsum dolor sit amet :guilabel:`Foo-Bar`.
+Lorem ipsum dolor sit amet :guilabel:`Foo-Bar`.