0.2.6 MediaWiki

- MediaWiki:
  - verbesserte RegEx-Ausdrücke in expandStarItems()
  - Korrekturen in specialMacrosToHtml()

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7f8de0f040f12af8bb295f2528a31e5efa8e9a5..705eabe2ff06c71f87028db0acf8a0aa2951634d 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-# V 0.2.6 Word umgebaut, verbImperfect
+# V 0.2.6 MediaWiki
+
+## Changed
+- MediaWiki: 
+  - verbesserte RegEx-Ausdrücke in expandStarItems()
+  - Korrekturen in specialMacrosToHtml()
+
+# V 0.2.7 Word umgebaut, verbImperfect
 
 ## Changed
 - Module Verb und Noun entfallen, Word arbeitet mit strukturiertem Attribut options

diff --git a/app/Helpers/MediaWiki.php b/app/Helpers/MediaWiki.php
index e752d057693c00d866a36a80ece144ec998c4a18..f9afb286f48b9bb60195b2c538b401cfd9b5ad3e 100644 (file)
--- a/app/Helpers/MediaWiki.php
+++ b/app/Helpers/MediaWiki.php
@@ -9,16 +9,18 @@ class MediaWiki extends MediaWikiBase
     {
         $rc = preg_replace(
             [
-                '/\*(\w[^*]+\w)\*/',
+                '/\*(\w.*?\w)\*/',
                 '/\*<(.+?)>\*/',
-                '/\*-(\w[^*]+\w)-\*/',
-                '/\*\+(\w[^*]+\w)\+\*/'
+                '/\*-(\w.*?\w)-\*/',
+                '/\*\+(\w.*?\w)\+\*/',
+                '/\*(\w)\*/'
             ],
             [
                 '%trans($1)%',
                 '%field($1)%',
                 '%del($1)%',
-                '%add($1)%'
+                '%add($1)%',
+                '%trans($1)%',
             ],
             $text
         );
@@ -38,14 +40,14 @@ class MediaWiki extends MediaWikiBase
                     break;
                 case 'trans':
                     $text = $matches[2];
-                    $info = count($matches) > 3 ? $text : substr($matches[3], 1);
+                    $info = count($matches) <= 3 ? $text : substr($matches[3], 1);
                     $rc = "<i><b data-toggle=\"tooltip\" data-placement=\"top\" title=\"$info\">$text</b></i>";
                     break;
                 case 'mark':
                     $rc = '<span class="lkn-text-' . substr($matches[3], 1) . '">' . $matches[2] . '</span>';
                     break;
                 case 'add':
-                    $rc = '<ins class="lkn-ins">' . (count($matches) == 4 ? ($matches[2] . $matches[3]) : $matches[2]) . '</ins>';
+                    $rc = '<ins class="lkn-ins">' . (count($matches) >= 4 ? ($matches[2] . $matches[3]) : $matches[2]) . '</ins>';
                     break;
                 case 'del':
                     $rc = '<del class="lkn-del">' . (count($matches) == 4 ? ($matches[2] . $matches[3]) : $matches[2]) . '</del>';
@@ -69,12 +71,6 @@ class MediaWiki extends MediaWikiBase
                     $class = $size == 0 ? '' : "lkn-icon-$size";
                     $rc = "<i class=\"$name $class\"></i>";
                     break;
-                case 'image':
-                    $name = $matches[2];
-                    $size = count($matches) < 4 ? null : $matches[3];
-                    $class = $size == 0 ? '' : "lkn-icon-$size";
-                    $rc = "<img class=\"$name $class\"></i>";
-                    break;
                 default:
                     $rc = $matches[0];
                     break;

diff --git a/composer.lock b/composer.lock
index 5ef73e4e9be9e60024d5e1df6ea268d9a7c6048a..297b6e5fc34c6651ba0480106339cac708ec6bfe 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1056,7 +1056,7 @@
             "dist": {
                 "type": "path",
                 "url": "../laraknife",
-                "reference": "fdc1af63b7d821c111b630663be1f0bcbba93fa5"
+                "reference": "646e4764a06caa8ed60766fd98c8ce6882479d9c"
             },
             "require-dev": {
                 "phpunit/phpunit": "11.0.x-dev"