diff --git a/exampleSite/content/docs/shortcodes/index.md b/exampleSite/content/docs/shortcodes/index.md
index 8fb65313..737e3e5d 100644
--- a/exampleSite/content/docs/shortcodes/index.md
+++ b/exampleSite/content/docs/shortcodes/index.md
@@ -252,10 +252,13 @@ Call to action
| Parameter | Description |
| --- | --- |
| `images` | **Required.** A regex string to match image names or URLs. |
+| `captions` | **Optional.** A list of `key:caption` pairs. Keys can be image filenames (for local images) or full URLs (for remote images). Captions support Markdown. |
| `aspectRatio` | **Optional.** The aspect ratio for the carousel. It is set to `16-9` by default. |
| `interval` | **Optional.** The interval for the auto-scrooling, specified in milliseconds. Defaults to `2000` (2s) |
+Captions are matched by key. For local images, use the filename (e.g. `01.jpg`). For remote images, use the full URL.
+
**Example 1:** 16:9 aspect ratio and verbose list of images
```md
@@ -272,6 +275,14 @@ Call to action
{{< carousel images="gallery/*" aspectRatio="21-9" interval="2500" >}}
+**Example 3:** Add captions
+
+```md
+{{* carousel images="gallery/*" captions="{01.jpg:First image with *formatting*,02.jpg:Second image with a [link](https://example.com)}" */>}}
+```
+
+{{< carousel images="gallery/*" captions="{01.jpg:First image with *formatting*,02.jpg:Second image with a [link](https://example.com)}" >}}
+
## Chart
diff --git a/layouts/shortcodes/carousel.html b/layouts/shortcodes/carousel.html
index db401e21..55e69358 100644
--- a/layouts/shortcodes/carousel.html
+++ b/layouts/shortcodes/carousel.html
@@ -12,12 +12,28 @@
{{ $images := slice }}
{{ range $imagesTemp }}
{{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }}
- {{ $images = $images | append (resources.GetRemote .) }}
+ {{ $images = $images | append (dict "resource" (resources.GetRemote .) "key" .) }}
{{ else }}
- {{ $images = $images | append ($page.Match .) }}
+ {{ range ($page.Match .) }}
+ {{ $images = $images | append (dict "resource" . "key" .Name) }}
+ {{ end }}
{{ end }}
{{ end }}
+{{ $captionsParam := .Get "captions" }}
+{{ $captions := dict }}
+{{ if $captionsParam }}
+ {{ $captionsTemp := strings.TrimPrefix "{" $captionsParam }}
+ {{ $captionsTemp = strings.TrimSuffix "}" $captionsTemp }}
+ {{ range (strings.Split $captionsTemp ",") }}
+ {{ $pair := strings.Split . ":" }}
+ {{ if ge (len $pair) 2 }}
+ {{ $key := strings.TrimSpace (index $pair 0) }}
+ {{ $value := strings.TrimSpace (delimit (after 1 $pair) ":") }}
+ {{ $captions = merge $captions (dict $key $value) }}
+ {{ end }}
+ {{ end }}
+{{ end }}
{{ if not .Parent }}