Merge branch 'develop' into fix-1025

Author: alandefreitas

.github/workflows/ci.yml

@@ -676,10 +676,49 @@ jobs:
           mkdir -p ../build/docs-local
           cp -vr build/site/* ../build/docs-local
 
-      - name: Generate Demos
+      - name: Clone Beman.Optional
+        uses: actions/checkout@v4
+        with:
+          repository: steve-downey/optional
+          ref: main
+          path: beman-optional
+
+      - name: Clone Fmt
+        uses: actions/checkout@v4
+        with:
+          repository: fmtlib/fmt
+          ref: master
+          path: fmt
+
+      - name: Clone Nlohmann.Json
+        uses: actions/checkout@v4
+        with:
+          repository: nlohmann/json
+          ref: develop
+          path: nlohmann-json
+
+      - name: Patch Demo Projects
+        shell: bash
         run: |
+          set -euo pipefail
           set -x
           
+          for project in beman-optional fmt nlohmann-json; do
+            src="./examples/third-party/$project"
+            dst="./$project"
+          
+            [ -d "$src" ] || { echo "Source not found: $src" >&2; exit 1; }
+            mkdir -p "$dst"
+          
+            # Mirror contents of $src into $dst, overwriting existing files
+            tar -C "$src" -cf - . | tar -C "$dst" -xpf -
+          done
+          
+
+      - name: Generate Demos
+        run: |
+          set -x
+                    
           declare -a generators=(
             "adoc"
             "xml"
@@ -691,16 +730,22 @@ jobs:
             for generator in "${generators[@]}"; do
               [[ $generator = xml && $variant = multi ]] && continue
               [[ $variant = multi ]] && multipage="true" || multipage="false"
-              # mrdocs boost.url demo
+              # boost.url demo
               mrdocs --config="$(pwd)/boost/libs/url/doc/mrdocs.yml" "../CMakeLists.txt" --output="$(pwd)/demos/boost-url/$variant/$generator" --multipage=$multipage --generator="$generator" --log-level=debug
               echo "Number of files in demos/boost-url/$variant/$generator: $(find demos/boost-url/$variant/$generator -type f | wc -l)"
+              # beman.optional demo
+              mrdocs --config="$(pwd)/beman-optional/docs/mrdocs.yml" --output="$(pwd)/demos/beman-optional/$variant/$generator" --multipage=$multipage --generator="$generator" --log-level=debug
+              # nlohmann-json demo
+              mrdocs --config="$(pwd)/nlohmann-json/docs/mrdocs.yml" --output="$(pwd)/demos/nlohmann-json/$variant/$generator" --multipage=$multipage --generator="$generator" --log-level=debug
+              # fmt demo
+              mrdocs --config="$(pwd)/fmt/doc/mrdocs.yml" --output="$(pwd)/demos/fmt/$variant/$generator" --multipage=$multipage --generator="$generator" --log-level=debug
               # mrdocs documenting mrdocs demo
               mrdocs --config="$(pwd)/docs/mrdocs.yml" "$(pwd)/CMakeLists.txt" --output="$(pwd)/demos/mrdocs/$variant/$generator" --multipage=$multipage --generator="$generator" --log-level=debug
             done
           
             # Render the asciidoc files to html using asciidoctor
             if [[ ${{ runner.os }} == 'Linux' ]]; then
-              for project in boost-url mrdocs; do
+              for project in boost-url beman-optional mrdocs fmt nlohmann-json; do
                 root="$(pwd)/demos/$project/$variant"
                 src="$root/adoc"
                 dst="$root/adoc-asciidoc"

docs/extensions/mrdocs-demos.js

@@ -130,6 +130,17 @@ function humanizeLibrary(library) {
     {
         return 'Beman.Optional';
     }
+    if (library === 'nlohmann-json')
+    {
+        return 'Nlohmann.JSON';
+    }
+    if (library === 'boost-scope') {
+        return 'Boost.Scope';
+    }
+    if (library === 'fmt') {
+        return 'Fmt';
+    }
+    // Match boost-<library> and convert to Boost.<Library> (capitalized)
     const boostLibrary = library.match(/boost-([\w]+)/);
     if (boostLibrary) {
         const capitalized = boostLibrary[1].charAt(0).toUpperCase() + boostLibrary[1].slice(1);
@@ -143,6 +154,12 @@ function libraryLink(library) {
         return 'https://github.com/boostorg/url[Boost.URL,window=_blank]';
     } else if (library === 'boost-scope') {
         return 'https://github.com/boostorg/scope[Boost.Scope,window=_blank]';
+    } else if (library === 'nlohmann-json') {
+        return 'https://www.github.com/nlohmann/json[Nlohmann.JSON,window=_blank]';
+    } else if (library === 'beman-optional') {
+        return 'https://www.github.com/steve-downey/optional[Beman.Optional,window=_blank]';
+    } else if (library === 'fmt') {
+        return 'https://github.com/fmtlib/fmt[fmt,window=_blank]';
     }
     return humanizeLibrary(library);
 }

docs/modules/ROOT/images/icons/no.svg

@@ -23,14 +23,16 @@ Tools like Doxygen typically require workarounds and manual intervention via pre
 These workarounds are problematic because they result in two versions of the code: the well-formed and the ill-formed versions.
 This subverts the single source of truth for the code.
 
+
+
 |===
 |  | Mr. Docs | Automatic | Manual | No Reference
 
-| No workarounds | ✅ | ❌ | ✅ | ❌
-| Nice for users | ✅ | ✅ | ✅ | ❌
-| Single Source of Truth | ✅ | ❌ | ❌ | ❌
-| Less Work for Developers | ✅ | ❌ | ❌ | ✅
-| Always up-to-date | ✅ | ✅ | ❌ | ❌
+| No workarounds | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16]
+| Nice for users | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16]
+| Single Source of Truth | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/no.svg[No,width=16,height=16]
+| Less Work for Developers | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/yes.svg[Yes,width=16,height=16]
+| Always up-to-date | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/yes.svg[Yes,width=16,height=16] | image:icons/no.svg[No,width=16,height=16] | image:icons/no.svg[No,width=16,height=16]
 |===
 
 * By providing no reference to users, they are forced to read header files to understand the API.

docs/modules/ROOT/images/icons/yes.svg

@@ -25,6 +25,7 @@
     font-weight: 700;
     color: #fff;
     white-space: nowrap;
+    font-size: 1rem;
 }
 
 @media (max-width: 576px) {

docs/modules/ROOT/pages/design-notes.adoc

@@ -16,7 +16,6 @@ html {
     radial-gradient(ellipse 100% 100% at 80% 100%, rgba(89, 36, 99, 0.8), transparent 60%),
     linear-gradient(135deg, #124b83, #124b83, #124b83);
   background-attachment: fixed;
-  background-blend-mode: screen;
   background-size: cover;
   background-repeat: no-repeat;
 }
@@ -118,7 +117,7 @@ object[type="image/svg+xml"]:not([width]) {
 }
 
 ::placeholder {
-  opacity: 0.5;
+  opacity: 0.75;
 }
 
 @media (pointer: fine) {

docs/shared/logo.css

@@ -1,5 +1,5 @@
 .doc {
-  color: var(--doc-font-color);
+  color: var(--doc-font-color) !important;
   font-size: var(--doc-font-size);
   hyphens: auto;
   line-height: var(--doc-line-height);
@@ -250,6 +250,14 @@
   margin-top: 1.5rem;
 }
 
+.doc table.tableblock tr:first-child {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.doc table.tableblock thead ~ tbody tr:first-child {
+  background-color: transparent;
+}
+
 .doc table.tableblock {
   font-size: calc(15 / var(--rem-base) * 1rem);
 }
@@ -277,7 +285,7 @@
 
 .doc table.tableblock,
 .doc table.tableblock > * > tr > * {
-  border: 0 solid var(--table-border-color);
+  border: 0 solid rgba(255, 255, 255, 0.4);
 }
 
 .doc table.grid-all > * > tr > * {
@@ -407,13 +415,13 @@
 
 .doc .admonitionblock td.icon i {
   align-items: center;
-  border-radius: 0.45rem;
   display: inline-flex;
   filter: initial;
   height: 1.25rem;
   padding: 0 0.5rem;
   vertical-align: initial;
   width: fit-content;
+  box-shadow: 2px 2px #000;
 }
 
 .doc .admonitionblock td.icon i::after {
@@ -1067,6 +1075,38 @@
   margin: 2rem 0 0;
 }
 
+.doc table.tableblock a img {
+  width: 28px !important;
+  height: 28px !important;
+}
+
+.doc table.tableblock a img[src*="asciidoc.svg"] {
+  width: 20px !important;
+  height: 20px !important;
+}
+
+.doc table.tableblock td:has(a):hover {
+  background-color: rgba(0, 0, 0, 0.3);
+  cursor: pointer;
+}
+
+.doc table.tableblock td:has(a) p {
+  margin: 0;
+  padding: 0;
+}
+
+.doc table.tableblock td:has(.image a) .image a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+}
+
+.doc table.tableblock td:has(.image) {
+  text-align: center;
+  vertical-align: middle;
+}
+
 #footnotes hr {
   border-top-width: 1px;
   margin-top: 0;
@@ -1087,3 +1127,41 @@
   text-align: right;
   width: 1.5em;
 }
+
+.tableblock [style*="color: darkblue"],
+.paragraph[id] [style*="color: darkblue"] {
+  color: #fff5b3 !important;
+}
+
+.paragraph span[style*="color: darkblue"] {
+  color: #fff !important;
+}
+
+.tableblock [style*="color: darkgreen"],
+.paragraph[id] [style*="color: darkgreen"] {
+  color: #fff !important;
+}
+
+.paragraph span[style*="color: darkgreen"] {
+  color: #fff !important;
+}
+
+.paragraph span[style*="color: red"] {
+  color: #fff !important;
+  font-style: italic;
+}
+
+.paragraph li span[style*="color: orangered"] {
+  color: #fff !important;
+  font-weight: bold;
+}
+
+.tableblock [style*="color: orangered"],
+.paragraph[id] [style*="color: orangered"] {
+  color: #fff !important;
+}
+
+.tableblock [style*="color: red"],
+.paragraph[id] [style*="color: red"] {
+  color: #fff !important;
+}

docs/ui/src/css/base.css

@@ -24,20 +24,27 @@ body {
   text-decoration: none;
 }
 
+.navbar-item:hover:not(.search),
+.navbar-item:focus:not(.search) {
+  color: var(--color-white);
+  transform: translateY(-1px);
+  transition: all 0.2s ease-in-out;
+}
+
 .navbar-brand {
   display: flex;
   flex: auto;
   padding-left: 1rem;
 }
 
 .navbar-brand .navbar-item {
-  color: var(--navbar-font-color);
+  color: var(--color-white-60);
 }
 
 .navbar-brand .navbar-item:first-child {
   align-self: center;
   padding: 0;
-  font-size: calc(22 / var(--rem-base) * 1rem);
+  font-size: calc(18 / var(--rem-base) * 1rem);
   flex-wrap: wrap;
   line-height: 1;
 }
@@ -47,10 +54,6 @@ body {
   word-wrap: normal;
 }
 
-.navbar-brand .navbar-item:first-child :not(:last-child) {
-  padding-right: 0.375rem;
-}
-
 .navbar-brand .navbar-item.search {
   flex: auto;
   justify-content: flex-end;
@@ -185,13 +188,20 @@ body {
 .navbar .button {
   display: inline-flex;
   align-items: center;
-  background: var(--navbar-button-background);
-  border: 1px solid var(--navbar-button-border-color);
-  border-radius: 0.15rem;
+  background: rgb(229, 190, 51);
   height: 1.75rem;
-  color: var(--navbar-button-font-color);
+  color: #0e0e0e;
+  font-weight: var(--body-font-weight-bold);
   padding: 0 0.75em;
   white-space: nowrap;
+  box-shadow: 4px 4px 0 #000;
+  transition: background-color 0.2s ease, transform 0.1s ease, box-shadow 0.1s ease;
+}
+
+.navbar .button:hover {
+  background: rgb(255, 215, 0);
+  transform: translateY(-2px);
+  box-shadow: 6px 6px 0 #000;
 }
 
 @media screen and (max-width: 768.5px) {
@@ -218,8 +228,8 @@ body {
   }
 
   .navbar-menu {
-    background: var(--navbar-menu-background);
     box-shadow: 0 8px 16px rgba(10, 10, 10, 0.1);
+    background-color: rgb(47 47 94);
     max-height: var(--body-min-height);
     overflow-y: auto;
     overscroll-behavior: none;
@@ -232,7 +242,9 @@ body {
 
   .navbar-menu a.navbar-item:hover,
   .navbar-menu .navbar-link:hover {
-    background: var(--navbar-menu_hover-background);
+    color: var(--color-white);
+    transform: translateY(-1px);
+    transition: all 0.2s ease-in-out;
   }
 }
 
@@ -280,14 +292,15 @@ body {
 
   .navbar-end > .navbar-item,
   .navbar-end .navbar-link {
-    color: var(--navbar-font-color);
+    color: var(--color-white-60);
   }
 
   .navbar-end > a.navbar-item:hover,
   .navbar-end .navbar-link:hover,
   .navbar-end .navbar-item.has-dropdown:hover .navbar-link {
-    background: var(--navbar_hover-background);
-    color: var(--navbar-font-color);
+    color: var(--color-white);
+    transform: translateY(-1px);
+    transition: all 0.2s ease-in-out;
   }
 
   .navbar-end .navbar-link::after {