Merge branch 'develop' into claude/parser-stream-performance-8cebe9

Resolve the macro_unscope.hpp conflict by keeping both sets of #undefs
and regenerate the amalgamation.

The \u fast path from #5738 (get_codepoint_bulk) assumed that bulk
scanning implies lazy position tracking and advanced the adapter with a
bare bulk_skip(4). Stream adapters now scan in bulk but track position
and token eagerly, so a lone-surrogate error was reported 4 columns too
early. Advance through bulk_consume() instead.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

docs/mkdocs/mkdocs.yml

@@ -455,8 +455,12 @@ plugins:
       # package badges (the fetch fails, then reading the missing cache entry
       # raises FileNotFoundError). Readers' browsers are served normally, so
       # leave these badges as external references instead of self-hosting them.
+      # The same goes for img.shields.io, whose version badges time out from
+      # time to time (strict mode turns the failed download into an error) and
+      # would go stale between builds if they were self-hosted anyway.
       assets_exclude:
         - repology.org/*
+        - img.shields.io/*
   - llmstxt:
       markdown_description: >
         JSON for Modern C++ is a C++11 header-only library implementing a JSON