Test shortcodes inside inline elements

samwilson · Jan 26, 2024 · fd9f2da · fd9f2da
1 parent b4435f9
commit fd9f2da
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "league/flysystem": "^1.0",
         "myclabs/php-enum": "^1.5",
         "samwilson/commonmark-latex": "^0.4",
-        "samwilson/commonmark-shortcodes": "^0.3",
+        "samwilson/commonmark-shortcodes": "^0.5",
         "samwilson/phpflickr": "^4.13",
         "symfony/cache": "^5.0",
         "symfony/console": "^5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/example/content/tags/goats.txt b/example/content/tags/goats.txt
@@ -8,4 +8,6 @@ Goats are a good example animal.
 
 Here's a photo of one on Flickr:
 
-{{{flickr id=20886993696 }}}
+{{{flickr|id=20886993696
+This is a *caption*.
+}}}
diff --git a/tests/TemplateTest.php b/tests/TemplateTest.php
@@ -64,7 +64,7 @@ public function testShortcodes(): void
 
 \begin{document}
 
-Test shortcodes. A file from Wikimedia Commons:
+\\emph{Test \\textsc{shortcodes}.} A file from Wikimedia Commons:
 
 
 

diff --git a/tests/test_site/content/shortcodes.txt b/tests/test_site/content/shortcodes.txt
@@ -1,3 +1,5 @@
-Test shortcodes. A file from Wikimedia Commons:
+*Test {small-caps|shortcodes}.* A file from Wikimedia Commons:
 
-{{{commons |file=Test.png }}}
+{{{commons |file=Test.png
+*Test caption.*
+}}}
diff --git a/tests/test_site/templates/shortcodes/commons.html.twig b/tests/test_site/templates/shortcodes/commons.html.twig
@@ -1,3 +1,4 @@
 <figure>
 This is Commons file {{shortcode.attrs.file}}
+<figcaption>{{shortcode.body|md2html|raw}}</figcaption>
 </figure>
diff --git a/tests/test_site/templates/shortcodes/small-caps.html.twig b/tests/test_site/templates/shortcodes/small-caps.html.twig
@@ -0,0 +1 @@
+<span style="text-variant:smallcaps">{{shortcode.attrs.1}}</span>
diff --git a/tests/test_site/templates/shortcodes/small-caps.tex.twig b/tests/test_site/templates/shortcodes/small-caps.tex.twig
@@ -0,0 +1 @@
+\textsc{{'{'}}{{shortcode.attrs.1}}{{'}'}}