Merge branch 'master' into chore/update-to-mkdocs-1.6

CONTRIBUTING.md

@@ -53,9 +53,9 @@ and brings value to both new and experienced users of Material for MkDocs.
     __Want to create a pull request?__ Learn how to create a comprehensive
     and useful pull request (PR)s
 
-  [Report a bug]: reporting-a-bug.md
-  [Report a docs issue]: reporting-a-docs-issue.md
-  [Request a change]: requesting-a-change.md
+  [Report a bug]: docs/contributing/reporting-a-bug.md
+  [Report a docs issue]: docs/contributing/reporting-a-docs-issue.md
+  [Request a change]: docs/contributing/requesting-a-change.md
   [Ask a question]: https://github.com/squidfunk/mkdocs-material/discussions
-  [Add translations]: https://github.com/squidfunk/mkdocs-material/adding-translations
+  [Add a translation]: docs/contributing/adding-translations
   [Create a pull request]: https://github.com/squidfunk/mkdocs-material/pulls

Dockerfile

@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-FROM python:3.11-alpine3.18
+FROM python:3.11-alpine3.19
 
 # Build-time flags
 ARG WITH_PLUGINS=true

docs/contributing/index.md

@@ -113,7 +113,7 @@ In this section, we guide your through our processes.
   [report a bug]: reporting-a-bug.md
   [report a docs issue]: reporting-a-docs-issue.md
   [request a change]: requesting-a-change.md
-  [add translations]: https://github.com/squidfunk/mkdocs-material/adding-translations
+  [add translations]: adding-translations.md
   [create a pull request]: making-a-pull-request.md
 
 ## Checklist

docs/reference/formatting.md

@@ -83,16 +83,16 @@ syntax, which is more convenient that directly using the corresponding
 [`mark`][mark], [`ins`][ins] and [`del`][del] HTML tags:
 
 ``` title="Text with highlighting"
-- ==This was marked==
-- ^^This was inserted^^
-- ~~This was deleted~~
+- ==This was marked (highlight)==
+- ^^This was inserted (underline)^^
+- ~~This was deleted (strikethrough)~~
 ```
 
 <div class="result" markdown>
 
-- ==This was marked==
-- ^^This was inserted^^
-- ~~This was deleted~~
+- ==This was marked (highlight)==
+- ^^This was inserted (underline)^^
+- ~~This was deleted (strikethrough)~~
 
 </div>
 

docs/schema/assets/icons.json

@@ -11492,6 +11492,7 @@
     "simple/jsfiddle",
     "simple/json",
     "simple/jsonwebtokens",
+    "simple/jsr",
     "simple/jss",
     "simple/juce",
     "simple/juejin",
@@ -12236,6 +12237,7 @@
     "simple/progate",
     "simple/progress",
     "simple/prometheus",
+    "simple/pronounsdotpage",
     "simple/prosieben",
     "simple/proteus",
     "simple/protocolsdotio",
@@ -12485,6 +12487,7 @@
     "simple/scania",
     "simple/schneiderelectric",
     "simple/scikitlearn",
+    "simple/scilab",
     "simple/scipy",
     "simple/scopus",
     "simple/scpfoundation",
@@ -12724,6 +12727,7 @@
     "simple/subversion",
     "simple/suckless",
     "simple/sumologic",
+    "simple/sunrise",
     "simple/supabase",
     "simple/supercrease",
     "simple/supermicro",

material/plugins/tags/plugin.py

@@ -97,8 +97,10 @@ def on_page_markdown(self, markdown, page, config, files):
             return self._render_tag_index(markdown)
 
         # Add page to tags index
-        for tag in page.meta.get("tags", []):
-            self.tags[tag].append(page)
+        tags = page.meta.get("tags", [])
+        if tags:
+            for tag in tags:
+                self.tags[tag].append(page)
 
     # Inject tags into page (after search and before minification)
     def on_page_context(self, context, page, config, nav):
@@ -110,7 +112,8 @@ def on_page_context(self, context, page, config, nav):
             return
 
         # Provide tags for page
-        if "tags" in page.meta:
+        context["tags"] =[]
+        if "tags" in page.meta and page.meta["tags"]:
             context["tags"] = [
                 self._render_tag(tag)
                     for tag in page.meta["tags"]

material/templates/partials/languages/ja.html

@@ -27,8 +27,8 @@
   "meta.comments": "コメント",
   "meta.source": "ソース",
   "nav": "ナビゲーション",
-  "readtime.one": "このページは約１分で読めます",
-  "readtime.other": "このページは約＃分で読めます",
+  "readtime.one": "このページは約1分で読めます",
+  "readtime.other": "このページは約#分で読めます",
   "rss.created": "新しいページのRSSフィード",
   "rss.updated": "更新されたページのRSSフィード",
   "search": "検索",

package.json

@@ -86,7 +86,7 @@
     "preact": "^10.20.2",
     "rimraf": "^5.0.5",
     "sass": "^1.75.0",
-    "simple-icons": "^11.12.0",
+    "simple-icons": "^11.13.0",
     "stylelint": "^15.11.0",
     "stylelint-config-recess-order": "4.2.0",
     "stylelint-config-recommended": "^13.0.0",

src/plugins/tags/plugin.py

@@ -97,8 +97,10 @@ def on_page_markdown(self, markdown, page, config, files):
             return self._render_tag_index(markdown)
 
         # Add page to tags index
-        for tag in page.meta.get("tags", []):
-            self.tags[tag].append(page)
+        tags = page.meta.get("tags", [])
+        if tags:
+            for tag in tags:
+                self.tags[tag].append(page)
 
     # Inject tags into page (after search and before minification)
     def on_page_context(self, context, page, config, nav):
@@ -110,7 +112,8 @@ def on_page_context(self, context, page, config, nav):
             return
 
         # Provide tags for page
-        if "tags" in page.meta:
+        context["tags"] =[]
+        if "tags" in page.meta and page.meta["tags"]:
             context["tags"] = [
                 self._render_tag(tag)
                     for tag in page.meta["tags"]

src/templates/partials/languages/ja.html

@@ -47,8 +47,8 @@
   "meta.comments": "コメント",
   "meta.source": "ソース",
   "nav": "ナビゲーション",
-  "readtime.one": "このページは約１分で読めます",
-  "readtime.other": "このページは約＃分で読めます",
+  "readtime.one": "このページは約1分で読めます",
+  "readtime.other": "このページは約#分で読めます",
   "rss.created": "新しいページのRSSフィード",
   "rss.updated": "更新されたページのRSSフィード",
   "search": "検索",