org ready ldc-1.41.0-beta1; flake using ldc-1.40.1

- plus minor housekeeping/tidy

9 files changed, 67 insertions, 37 deletions

diff --git a/.envrc-nix b/.envrc-nix
index fef0626..e4bd82e 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -26,7 +26,7 @@ echo '
   • nix develop using nixpkgs
     ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
     ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
-  • nix develop using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
+  • nix develop using package overlays: (dmd-2.111.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
     ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh
     ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
   ❯❯ nix flake show
@@ -40,7 +40,7 @@ echo '
   • nix build using nixpkgs
     ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
     ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
-  • nix build using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
+  • nix build using package overlays: (dmd-2.111.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
     ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
     ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs
 
diff --git a/flake.lock b/flake.lock
index 5a8c597..d5cbe44 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740019556,
-        "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dad564433178067be1fbdfcce23b546254b6d641",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e54fb9d..efe91c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
     '';
     localOverlay = (final: prev: {
       ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.40.1
-      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.110.0
+      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.111.0
       dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? 1.39.0
       dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok 2.110.0
       #gdc = prev.callPackage ./nix-overlays/gdc {  };
@@ -131,7 +131,7 @@
         spine-overlay-dmd = stdenv.mkDerivation {
           inherit pname;
           inherit version;
-          #name = "spine-0.18.0 dmd-2.110.0 dub-1.39.0";
+          #name = "spine-0.18.0 dmd-2.111.0 dub-1.39.0";
           meta.mainProgram = "spine-dmd";
           executable = true;
           src = self;
@@ -255,7 +255,7 @@
           inherit shellHook;
         };
         dsh-overlay-dmd-dub = mkShell {
-          name = "spine-0.18.0 base dev shell, dmd-2.110.0, dub-1.39.0 - dtools-2.110.0";
+          name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
           packages = with pkgs-ovl; [
diff --git a/org/config_env.org b/org/config_env.org
index db6af9d..1eb1f6d 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -175,7 +175,7 @@ export SpineDBpath=/var/www/sqlite
 #export SpineDBpath=/srv/www/spine/sqlite
 #+END_SRC
 
-* SHARED versions
+* versions GET
 ** direnv
 
 #+NAME: direnv_version
diff --git a/org/config_nix.org b/org/config_nix.org
index 3ec97d0..de1d3b0 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1032,9 +1032,8 @@ postInstall:
 	echo `ls -la $${out}/bin/spine`
 #+END_SRC
 
-* SHARED
-** versions
-*** spine project VERSION :version:set:project:
+* versions GET
+** spine project VERSION :version:set:project:
 
 #+NAME: spine_version
 #+HEADER: :noweb yes
@@ -1042,8 +1041,8 @@ postInstall:
 <<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
 #+END_SRC
 
-*** dlang overlays
-**** ldc
+** dlang overlays
+*** ldc
 
 #+NAME: ldc_version
 #+HEADER: :noweb yes
@@ -1051,7 +1050,7 @@ postInstall:
 <<./nix-develop-dlang-shared.org:ldc-version()>>
 #+END_SRC
 
-**** dmd
+*** dmd
 
 #+NAME: dmd_version
 #+HEADER: :noweb yes
@@ -1059,7 +1058,7 @@ postInstall:
 <<./nix-develop-dlang-shared.org:dmd-version()>>
 #+END_SRC
 
-**** dub
+*** dub
 
 #+NAME: dub_version
 #+HEADER: :noweb yes
@@ -1067,7 +1066,7 @@ postInstall:
 <<./nix-develop-dlang-shared.org:dub-version()>>
 #+END_SRC
 
-**** dtools
+*** dtools
 
 #+NAME: dtools_version
 #+HEADER: :noweb yes
@@ -1075,15 +1074,14 @@ postInstall:
 <<./nix-develop-dlang-shared.org:dtools-version()>>
 #+END_SRC
 
-*** empty sha56 hash
+** sha256 blank hash
 
-#+NAME: blank_hash
+#+NAME: sha256-blank
 #+BEGIN_SRC nix
-sha256-0000000000000000000000000000000000000000000=
+<<./nix-develop-dlang-shared.org:sha256-blank()>>
 #+END_SRC
 
-#+NAME: assumed_hash
+#+NAME: blank_hash
 #+BEGIN_SRC nix
-sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+<<./nix-develop-dlang-shared.org:sha256-blank()>>
 #+END_SRC
-
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index e40403d..1d8fe34 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -81,6 +81,9 @@ sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
 
 * dlang
 ** ldc
+
+- https://github.com/ldc-developers/ldc/releases
+
 *** version SET
 **** version & sha256 nix composite
 
@@ -108,6 +111,27 @@ sha256 = "<<ldc-hash>>";
 #+END_SRC
 
 *** versions
+**** 1.41
+***** 1.41.0 beta1 OK ✓
+
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0-beta1.tar.gz
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
+
+#+NAME: ldc_version_1_41_0
+#+BEGIN_SRC nix
+1.41.0-beta1
+#+END_SRC
+
+#+NAME: ldc_hash_1_41_0
+#+BEGIN_SRC nix
+sha256-FSdBOVkHdEJ7flKTyjkE0MCEUIMOXRv4uBn8OKPPdn4=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_41_0
+#+BEGIN_SRC nix
+llvm_19
+#+END_SRC
+
 **** 1.40 OK ✓
 ***** 1.40.1 OK ✓
 
@@ -242,6 +266,9 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
 #+END_SRC
 
 ** dmd
+
+- https://github.com/dlang/dmd/tags
+
 *** version SET
 
 #+NAME: dmd-version
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index f79d3e2..1b89d89 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -1309,7 +1309,7 @@ stdenv.mkDerivation (finalAttrs: {
 })
 #+END_SRC
 
-*** dcompiler SET
+*** dcompiler
 
 #+NAME: dcompiler
 #+BEGIN_SRC nix
@@ -1522,9 +1522,9 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
      $(ROOT)/catdoc$(DOTEXE) \
 #+END_SRC
 
-** versions SET
+** versions GET
 *** direnv
-***** select version SET OK ✓
+***** select version
 
 #+NAME: direnv_version
 #+HEADER: :noweb yes
@@ -1545,7 +1545,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 <<./nix-develop-dlang-shared.org:ldc-version-info()>>
 #+END_SRC
 
-***** select version SET OK ✓
+***** selected version
 
 #+NAME: ldc_version
 #+HEADER: :noweb yes
@@ -1564,6 +1564,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 #+END_SRC
 
 *** dmd
+**** selected version
 
 #+NAME: dmd_version
 #+HEADER: :noweb yes
@@ -1582,6 +1583,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 #+END_SRC
 
 *** dub
+**** selected version
 
 #+NAME: dub_version
 #+HEADER: :noweb yes
@@ -1595,6 +1597,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 #+END_SRC
 
 *** dtools
+**** selected version
 
 #+NAME: dtools_version
 #+HEADER: :noweb yes
diff --git a/org/ocda.org b/org/ocda.org
index 148edf8..2509725 100644
--- a/org/ocda.org
+++ b/org/ocda.org
@@ -1,6 +1,7 @@
 -*- mode: org -*-
 #+TITLE:       sisudoc spine (doc_reform) object-centric document abstraction
 #+DESCRIPTION: documents - structuring, publishing in multiple formats & search
+#+SUMMARY:     process markup document, create document abstraction
 #+FILETAGS:    :spine:abstraction:
 #+AUTHOR:      Ralph Amissah
 #+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -18,7 +19,8 @@
 - [[./doc-reform.org][doc-reform.org]]  [[./][org/]]
 
 * (Object-Centric) Document Abstraction
-Process markup document, create document abstraction.
+
+- Process markup document, create document abstraction
 
 ** _module template_ :module:metadoc_from_src:
 
@@ -69,7 +71,7 @@ mixin docAbstractionFunctions;
 #+END_SRC
 
 ** docAbstraction
-*** abstraction summary
+*** _toc_ abstraction summary
 
 #+NAME: docAbstraction
 #+HEADER: :noweb yes
@@ -219,7 +221,7 @@ int cnt1 = 1; int cnt2 = 1; int cnt3 = 1;
 // abstraction init ↑
 #+END_SRC
 
-*** abstraction init substitutions
+*** debug abstraction init substitutions
 
 #+NAME: docAbstractionInitSubstitutionsDebug
 #+HEADER: :noweb yes
@@ -231,8 +233,8 @@ debug (substitutions) {
   }
   if (conf_make_meta.make.substitute) {
     foreach(substitution_pair; conf_make_meta.make.substitute) {
-       writeln("regex to match:       ", substitution_pair[Substitute.match]);
-       writeln("substitution to make: ", substitution_pair[Substitute.markup]);
+      writeln("regex to match:       ", substitution_pair[Substitute.match]);
+      writeln("substitution to make: ", substitution_pair[Substitute.markup]);
     }
   }
   if (conf_make_meta.make.bold) {
@@ -250,7 +252,7 @@ debug (substitutions) {
 }
 #+END_SRC
 
-*** loop source by line (large block)
+*** _loop_ source by line (large block)
 
 #+NAME: docAbstractionMainLoopSrcByLine
 #+HEADER: :noweb yes
@@ -883,7 +885,7 @@ _loopMarkupSrcByLineStruct loopMarkupSrcByLine(
 }
 #+END_SRC
 
-*** post loop (consider and segment/break up further in code & org)
+*** _post loop_ (consider and segment/break up further in code & org)
 
 #+NAME: docAbstractionPostMainLoop
 #+HEADER: :noweb yes
@@ -1456,7 +1458,7 @@ debug(segnames) {
 }
 #+END_SRC
 
-*** return structure
+*** _return structure_
 
 #+NAME: docAbstractionReturnsStruct
 #+HEADER: :noweb yes
diff --git a/src/sisudoc/meta/metadoc_from_src.d b/src/sisudoc/meta/metadoc_from_src.d
index 4aa49dc..b5b4f6d 100644
--- a/src/sisudoc/meta/metadoc_from_src.d
+++ b/src/sisudoc/meta/metadoc_from_src.d
@@ -214,8 +214,8 @@ template docAbstraction() {
       }
       if (conf_make_meta.make.substitute) {
         foreach(substitution_pair; conf_make_meta.make.substitute) {
-           writeln("regex to match:       ", substitution_pair[Substitute.match]);
-           writeln("substitution to make: ", substitution_pair[Substitute.markup]);
+          writeln("regex to match:       ", substitution_pair[Substitute.match]);
+          writeln("substitution to make: ", substitution_pair[Substitute.markup]);
         }
       }
       if (conf_make_meta.make.bold) {