Skip to content

Commit 627737a

Browse files
authored
Merge pull request #7942 from squidfunk/merge/chipotle
Merged features tied to 'Chipotle' funding goal
2 parents 07a434b + 49daf57 commit 627737a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+6286
-630
lines changed

CHANGELOG

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
mkdocs-material-9.6.0 (2025-01-31)
2+
3+
* Added meta plugin
4+
* Rewrite of the tags plugin
5+
* Added support for allow lists in tags plugin
6+
* Added support for and custom sorting in tags plugin
7+
* Added support for related links in blog plugin
8+
* Added support for custom index pages in blog plugin
9+
* Added support for navigation subtitles
10+
* Fixed #7924: Anchors might require two clicks when using instant navigation
11+
112
mkdocs-material-9.5.50 (2025-01-18)
213

314
* Fixed #7913: Social plugin renders attribute lists in page title

docs/changelog/index.md

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
## Material for MkDocs
44

5+
### 9.6.0 <small>January 31, 2025</small> { id="9.6.0" }
6+
7+
- Added meta plugin
8+
- Rewrite of the tags plugin
9+
- Added support for allow lists in tags plugin
10+
- Added support for and custom sorting in tags plugin
11+
- Added support for related links in blog plugin
12+
- Added support for custom index pages in blog plugin
13+
- Added support for navigation subtitles
14+
- Fixed #7924: Anchors might require two clicks when using instant navigation
15+
516
### 9.5.50 <small>January 18, 2025</small> { id="9.5.50" }
617

718
- Fixed #7913: Social plugin renders attribute lists in page title

docs/insiders/benefits.md

+21-27
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ for you to __start using now__.
77

88
## Features
99

10-
Our sponsors currently enjoy access to the following 26 additional features. New
10+
Our sponsors currently enjoy access to the following 20 additional features. New
1111
features are added regularly, so be sure to check back regularly to stay
1212
updated.
1313

1414
<div class="mdx-columns" markdown>
1515

16-
- [x] [Blog plugin: pinned posts] :material-alert-decagram:{ .mdx-pulse title="Added on February 24, 2024" }
17-
- [x] [Instant previews] :material-alert-decagram:{ .mdx-pulse title="Added on January 28, 2024" }
18-
- [x] [Footnote tooltips] :material-alert-decagram:{ .mdx-pulse title="Added on January 24, 2024" }
16+
- [x] [Blog plugin: pinned posts]
17+
- [x] [Instant previews]
18+
- [x] [Footnote tooltips]
1919
- [x] [Tags plugin: advanced settings]
2020
- [x] [Tags plugin: nested tags]
2121
- [x] [Tags plugin: shadow tags]
@@ -33,12 +33,6 @@ updated.
3333
- [x] [Navigation path] (Breadcrumbs)
3434
- [x] [Typeset plugin]
3535
- [x] [Privacy plugin: external links]
36-
- [x] [Navigation subtitles]
37-
- [x] [Tags plugin: allow list] + [custom sorting]
38-
- [x] [Blog plugin: custom index pages]
39-
- [x] [Blog plugin: related links]
40-
- [x] [Meta plugin]
41-
- [x] [Tags plugin: configurable listings]
4236

4337
</div>
4438

@@ -100,23 +94,6 @@ planned, but not yet implemented. This means that each funding goal unlocks new
10094
features for general availability in the community edition, after sponsors have
10195
used them for a while.
10296

103-
#### $ 16,000 – Chipotle
104-
105-
- [x] [Meta plugin]
106-
- [x] [Blog plugin: related links]
107-
- [x] [Blog plugin: custom index pages]
108-
- [x] [Tags plugin: configurable listings]
109-
- [x] [Tags plugin: allow list] + [custom sorting]
110-
- [x] [Navigation subtitles]
111-
112-
[Meta plugin]: ../plugins/meta.md
113-
[Blog plugin: related links]: ../setup/setting-up-a-blog.md#adding-related-links
114-
[Blog plugin: custom index pages]: ../setup/setting-up-a-blog.md#custom-index-pages
115-
[Tags plugin: configurable listings]: ../setup/setting-up-tags.md#configurable-listings
116-
[Tags plugin: allow list]: ../plugins/tags.md#config.tags_allowed
117-
[custom sorting]: ../plugins/tags.md#config.tags_sort_by
118-
[Navigation subtitles]: ../reference/index.md#setting-the-page-subtitle
119-
12097
#### $ 18,000 – Lemon Drop
12198

12299
- [x] [Optimize plugin]
@@ -184,6 +161,23 @@ sponsors. Those features were once part of Material for MkDocs Insiders, and
184161
therefore only available to our sponsors, and are now generally available to
185162
be used by all users.
186163

164+
#### $ 16,000 – Chipotle
165+
166+
- [x] [Meta plugin]
167+
- [x] [Blog plugin: related links]
168+
- [x] [Blog plugin: custom index pages]
169+
- [x] [Tags plugin: configurable listings]
170+
- [x] [Tags plugin: allow list] + [custom sorting]
171+
- [x] [Navigation subtitles]
172+
173+
[Meta plugin]: ../plugins/meta.md
174+
[Blog plugin: related links]: ../setup/setting-up-a-blog.md#adding-related-links
175+
[Blog plugin: custom index pages]: ../setup/setting-up-a-blog.md#custom-index-pages
176+
[Tags plugin: configurable listings]: ../setup/setting-up-tags.md#configurable-listings
177+
[Tags plugin: allow list]: ../plugins/tags.md#config.tags_allowed
178+
[custom sorting]: ../plugins/tags.md#config.tags_sort_by
179+
[Navigation subtitles]: ../reference/index.md#setting-the-page-subtitle
180+
187181
#### $ 14,000 – Goat's Horn
188182

189183
- [x] [Privacy plugin]

docs/plugins/meta.md

+3-13
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ pages in a folder, i.e., a subsection of your project, which is particularly
1010
useful to ensure that a certain subset of pages features specific tags, uses a
1111
custom template, or is attributed to an author.
1212

13-
---
14-
15-
<!-- md:sponsors --> __Sponsors only__ – this plugin is currently reserved to
16-
[our awesome sponsors].
17-
18-
[our awesome sponsors]: ../insiders/index.md
19-
2013
## Objective
2114

2215
### How it works
@@ -132,8 +125,7 @@ of the meta plugin and other built-in plugins are:
132125

133126
## Configuration
134127

135-
<!-- md:sponsors -->
136-
<!-- md:version insiders-4.21.0 -->
128+
<!-- md:version 9.6.0 -->
137129
<!-- md:plugin [meta] – built-in -->
138130
<!-- md:flag experimental -->
139131

@@ -160,8 +152,7 @@ The following settings are available:
160152

161153
#### <!-- md:setting config.enabled -->
162154

163-
<!-- md:sponsors -->
164-
<!-- md:version insiders-4.38.0 -->
155+
<!-- md:version 9.6.0 -->
165156
<!-- md:default `true` -->
166157

167158
Use this setting to enable or disable the plugin when [building your project].
@@ -184,8 +175,7 @@ The following settings are available for meta files:
184175

185176
#### <!-- md:setting config.meta_file -->
186177

187-
<!-- md:sponsors -->
188-
<!-- md:version insiders-4.21.0 -->
178+
<!-- md:version 9.6.0 -->
189179
<!-- md:default `.meta.yml` -->
190180

191181
Use this setting to change the meta file name the plugin will look for when

docs/plugins/tags.md

+28-45
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,14 @@ is enabled.
134134
<!-- md:version 8.2.0 -->
135135
<!-- md:default none -->
136136

137-
!!! info "This setting is not needed in [Insiders]"
137+
!!! warning "This setting is deprecated"
138138

139-
Insiders ships a __ground up rewrite of the tags plugin__ which is infinitely
140-
more powerful than the current version in the community edition. It allows
141-
for an arbitrary number of tags indexes (listings), [scoped listings],
142-
[shadow tags], [nested tags], and much more.
139+
As of version <!-- md:version 9.6.0 -->, this setting is deprecated, as this
140+
version ships a __ground up rewrite of the tags plugin__ which is much more
141+
powerful than the previous version. Tags [listings] can be used on any page
142+
now.
143+
144+
<div style="opacity: 0.5" markdown>
143145

144146
Use this setting to specify the location of the tags index, which is the page
145147
used to render a list of all tags and their associated pages. If this setting is
@@ -158,17 +160,15 @@ if you want to have a tags index.
158160

159161
The provided path is resolved from the [`docs` directory][mkdocs.docs_dir].
160162

161-
[Insiders]: ../insiders/index.md
162-
[scoped listings]: ../setup/setting-up-tags.md#scoped-listings
163-
[shadow tags]: ../setup/setting-up-tags.md#shadow-tags
164-
[nested tags]: ../setup/setting-up-tags.md#nested-tags
163+
</div>
164+
165+
[listings]: ../setup/setting-up-tags.md#adding-a-tags-index
165166

166167
---
167168

168169
#### <!-- md:setting config.tags_slugify -->
169170

170-
<!-- md:sponsors -->
171-
<!-- md:version insiders-4.25.0 -->
171+
<!-- md:version 9.6.0 -->
172172
<!-- md:default [`pymdownx.slugs.slugify`][pymdownx.slugs.slugify] -->
173173

174174
Use this setting to change the function for generating URL-compatible slugs
@@ -194,8 +194,7 @@ more granular control.
194194

195195
#### <!-- md:setting config.tags_slugify_separator -->
196196

197-
<!-- md:sponsors -->
198-
<!-- md:version insiders-4.25.0 -->
197+
<!-- md:version 9.6.0 -->
199198
<!-- md:default `-` -->
200199

201200
Use this setting to change the separator that is passed to the slugification
@@ -212,8 +211,7 @@ plugins:
212211

213212
#### <!-- md:setting config.tags_slugify_format -->
214213

215-
<!-- md:sponsors -->
216-
<!-- md:version insiders-4.48.0 -->
214+
<!-- md:version 9.6.0 -->
217215
<!-- md:default `tag:{slug}` -->
218216

219217
Use this setting to change the format string that is used when generating tag
@@ -272,8 +270,7 @@ plugins:
272270

273271
#### <!-- md:setting config.tags_sort_by -->
274272

275-
<!-- md:sponsors -->
276-
<!-- md:version insiders-4.26.2 -->
273+
<!-- md:version 9.6.0 -->
277274
<!-- md:default `material.plugins.tags.tag_name` -->
278275

279276
Use this setting to specify a custom function for comparing tags. By default,
@@ -294,8 +291,7 @@ or number representing the tag, that is used for sorting, and reference it in
294291

295292
#### <!-- md:setting config.tags_sort_reverse -->
296293

297-
<!-- md:sponsors -->
298-
<!-- md:version insiders-4.26.2 -->
294+
<!-- md:version 9.6.0 -->
299295
<!-- md:default `false` -->
300296

301297
Use this setting to reverse the order in which tags are sorted when comparing
@@ -312,8 +308,7 @@ plugins:
312308

313309
#### <!-- md:setting config.tags_name_property -->
314310

315-
<!-- md:sponsors -->
316-
<!-- md:version insiders-4.48.0 -->
311+
<!-- md:version 9.6.0 -->
317312
<!-- md:default [`tags`][meta.tags] -->
318313

319314
Use this setting to change the name of the front matter property that is used by
@@ -330,8 +325,7 @@ plugins:
330325

331326
#### <!-- md:setting config.tags_name_variable -->
332327

333-
<!-- md:sponsors -->
334-
<!-- md:version insiders-4.48.0 -->
328+
<!-- md:version 9.6.0 -->
335329
<!-- md:default `tags` -->
336330

337331
Use this setting to change the name of the template variable that is used by
@@ -348,8 +342,7 @@ plugins:
348342

349343
#### <!-- md:setting config.tags_allowed -->
350344

351-
<!-- md:sponsors -->
352-
<!-- md:version insiders-4.25.0 -->
345+
<!-- md:version 9.6.0 -->
353346
<!-- md:default none -->
354347

355348
The plugin allows to check tags against a predefined list, in order to catch
@@ -377,8 +370,7 @@ The following settings are available for listings:
377370

378371
#### <!-- md:setting config.listings -->
379372

380-
<!-- md:sponsors -->
381-
<!-- md:version insiders-4.48.0 -->
373+
<!-- md:version 9.6.0 -->
382374
<!-- md:default `true` -->
383375

384376
Use this setting to enable or disable listings. It is normally not necessary to
@@ -400,8 +392,7 @@ is enabled.
400392

401393
#### <!-- md:setting config.listings_map -->
402394

403-
<!-- md:sponsors -->
404-
<!-- md:version insiders-4.48.0 -->
395+
<!-- md:version 9.6.0 -->
405396
<!-- md:default none -->
406397

407398
Use this define listing configurations that you can then reference in listings
@@ -431,8 +422,7 @@ See the [listings section] for a list of all available settings.
431422

432423
#### <!-- md:setting config.listings_sort_by -->
433424

434-
<!-- md:sponsors -->
435-
<!-- md:version insiders-4.39.0 -->
425+
<!-- md:version 9.6.0 -->
436426
<!-- md:default `material.plugins.tags.item_title` -->
437427

438428
Use this setting to specify a custom function for comparing listing items. By
@@ -463,8 +453,7 @@ or number representing the item, that is used for sorting, and reference it in
463453

464454
#### <!-- md:setting config.listings_sort_reverse -->
465455

466-
<!-- md:sponsors -->
467-
<!-- md:version insiders-4.39.0 -->
456+
<!-- md:version 9.6.0 -->
468457
<!-- md:default `false` -->
469458

470459
Use this setting to reverse the order in which items are sorted when comparing
@@ -481,8 +470,7 @@ plugins:
481470

482471
#### <!-- md:setting config.listings_tags_sort_by -->
483472

484-
<!-- md:sponsors -->
485-
<!-- md:version insiders-4.48.0 -->
473+
<!-- md:version 9.6.0 -->
486474
<!-- md:default `material.plugins.tags.tag_name` -->
487475

488476
Use this setting to specify a custom function for comparing tags in listings. By
@@ -503,8 +491,7 @@ or number representing the tag, that is used for sorting, and reference it in
503491

504492
#### <!-- md:setting config.listings_tags_sort_reverse -->
505493

506-
<!-- md:sponsors -->
507-
<!-- md:version insiders-4.48.0 -->
494+
<!-- md:version 9.6.0 -->
508495
<!-- md:default `false` -->
509496

510497
Use this setting to reverse the order in which tags are sorted when comparing
@@ -521,8 +508,7 @@ plugins:
521508

522509
#### <!-- md:setting config.listings_directive -->
523510

524-
<!-- md:sponsors -->
525-
<!-- md:version insiders-4.48.0 -->
511+
<!-- md:version 9.6.0 -->
526512
<!-- md:default `material/tags` -->
527513

528514
Use this setting to change the name of the directive the plugin will look for
@@ -777,8 +763,7 @@ The following settings are available:
777763

778764
#### <!-- md:setting listing.scope -->
779765

780-
<!-- md:sponsors -->
781-
<!-- md:version insiders-4.48.0 -->
766+
<!-- md:version 9.6.0 -->
782767
<!-- md:default `false` -->
783768

784769
This setting specifies whether the listing should only consider pages that are
@@ -879,8 +864,7 @@ setting on a per-listing basis:
879864

880865
#### <!-- md:setting listing.include -->
881866

882-
<!-- md:sponsors -->
883-
<!-- md:version insiders-4.48.0 -->
867+
<!-- md:version 9.6.0 -->
884868
<!-- md:default none -->
885869

886870
Use this setting to specify which tags should be included in the listing. Each
@@ -917,8 +901,7 @@ If this setting is left empty, all tags and pages are included.
917901

918902
#### <!-- md:setting listing.exclude -->
919903

920-
<!-- md:sponsors -->
921-
<!-- md:version insiders-4.48.0 -->
904+
<!-- md:version 9.6.0 -->
922905
<!-- md:default none -->
923906

924907
Use this setting to specify which tags should be excluded from the listing. Each

docs/reference/footnotes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ See additional configuration options:
2626
2727
[Footnotes]: ../setup/extensions/python-markdown.md#footnotes
2828
29-
### Footnote tooltips :material-alert-decagram:{ .mdx-pulse title="Added on January 24, 2024" }
29+
### Footnote tooltips
3030
3131
<!-- md:sponsors -->
3232
<!-- md:version insiders-4.51.0 -->

docs/reference/index.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ page status] to get you started.
144144

145145
### Setting the page `subtitle`
146146

147-
<!-- md:sponsors -->
148-
<!-- md:version insiders-4.25.0 -->
147+
<!-- md:version 9.6.0 -->
149148
<!-- md:flag experimental -->
150149

151150
Each page can define a subtitle, which is then rendered below the title as part

0 commit comments

Comments
 (0)