mwsis
diff --git a/‎.gitignore
-2 b/‎.gitignore
-2
diff --git a/‎.vscode/settings.json
+1 b/‎.vscode/settings.json
+1
diff --git a/‎CHANGES.txt
+18-1 b/‎CHANGES.txt
+18-1
diff --git a/‎CMakeLists.txt
+8-1 b/‎CMakeLists.txt
+8-1
diff --git a/‎HISTORY.md
+17 b/‎HISTORY.md
+17
diff --git a/‎INSTALL.md
+1-1 b/‎INSTALL.md
+1-1
diff --git a/‎NEWS.md
+1 b/‎NEWS.md
+1
diff --git a/‎README.md
+12-10 b/‎README.md
+12-10
diff --git a/‎examples/c/example.c.factorial/CMakeLists.txt
+1-1 b/‎examples/c/example.c.factorial/CMakeLists.txt
+1-1
diff --git a/‎examples/c/example.c.factorial/example.c.factorial.c ‎examples/c/example.c.factorial/main.c
+8-8 b/‎examples/c/example.c.factorial/example.c.factorial.c ‎examples/c/example.c.factorial/main.c
+8-8
diff --git a/‎examples/c/example.c.runner/CMakeLists.txt
+1-1 b/‎examples/c/example.c.runner/CMakeLists.txt
+1-1
diff --git a/‎examples/c/example.c.runner/example.c.runner.c ‎examples/c/example.c.runner/main.c
+3-3 b/‎examples/c/example.c.runner/example.c.runner.c ‎examples/c/example.c.runner/main.c
+3-3
diff --git a/‎examples/c/example.c.tests/CMakeLists.txt
+1-1 b/‎examples/c/example.c.tests/CMakeLists.txt
+1-1
diff --git a/‎examples/c/example.c.tests/example.c.tests.c ‎examples/c/example.c.tests/main.c
+3-3 b/‎examples/c/example.c.tests/example.c.tests.c ‎examples/c/example.c.tests/main.c
+3-3
diff --git a/‎examples/cpp/example.cpp.temp_directory/CMakeLists.txt
+1-1 b/‎examples/cpp/example.cpp.temp_directory/CMakeLists.txt
+1-1
diff --git a/‎examples/cpp/example.cpp.temp_directory/example.cpp.temp_directory.cpp ‎examples/cpp/example.cpp.temp_directory/main.cpp
+16-12 b/‎examples/cpp/example.cpp.temp_directory/example.cpp.temp_directory.cpp ‎examples/cpp/example.cpp.temp_directory/main.cpp
+16-12
diff --git a/‎examples/cpp/example.cpp.temp_file/CMakeLists.txt
+1-1 b/‎examples/cpp/example.cpp.temp_file/CMakeLists.txt
+1-1
@@ -24,15 +24,13 @@
 /include/shwild/
 /include/xcontract/
 /include/xcover/
-/include/xtests/
 
 /src/b64/
 /src/cstring/
 /src/recls/
 /src/shwild/
 /src/xcontract/
 /src/xcover/
-/src/xtests/
 
 Debug Multithreaded DLL/
 Debug Multithreaded Dll/
 
@@ -136,6 +136,7 @@
 		"xloctime": "cpp",
 		"xmemory": "cpp",
 		"xstring": "cpp",
+		"xtests.internal.string.c": "cpp",
 		"xtr1common": "cpp",
 		"xtree": "cpp",
 		"xutility": "cpp",
 
@@ -2,7 +2,7 @@ xTests - Changes
 ================
 
 Created: 22nd February 2008
-Updated: 14th July 2024
+Updated: 23rd November 2024
 
 
     ************************************
@@ -16,6 +16,23 @@ Updated: 14th July 2024
     ************************************
 
 
+31st December 2024 - 0.26.0-beta1
+=================================
+
+ * now uses `stlsoft::integral_traits<>` for integer test macros (in C++) to allow for custom integral types to be tested;
+ * `temp_file` now takes a `hint_dir` parameter to allow specification of directory for (temporary) file;
+ * added missing test macros `XTESTS_TEST_FLOATINGPOINT_GREATER()`, `XTESTS_TEST_FLOATINGPOINT_GREATER_OR_EQUAL()`, `XTESTS_TEST_FLOATINGPOINT_LESS()`, `XTESTS_TEST_FLOATINGPOINT_LESS_OR_EQUAL()`;
+ * added macro `XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY()`, which allows for a unified command-line parsing in test programs;
+ * added terse forms of macros, available by including **xtests/terse-api.h**;
+ * `XTESTS_COMMANDLINE_PARSE_VERBOSITY()` now also recognises, if the command-line argument `"--verbosity= . . ."` is not found, the enviroment variables `"XTESTS_VERBOSITY"` and `"TEST_VERBOSITY"`;
+ * added test programs **test.scratch.all_failure_messages**, **test.scratch.basics2**, **test.scratch.custom_integral_types**,
+ * substantial internal refactoring;
+ * minor tidying to CMake facilities;
+ * minor improvements to examples;
+ * minor improvements to project boilerplate files;
+ * updated **STLSoft** constructs, incl. macros;
+
+
 18th November 2024 - 0.25.4
 ===========================
 
 
@@ -5,7 +5,7 @@
 # Purpose:  Top-level CMake lists file for xTests
 #
 # Created:  9th October 2019
-# Updated:  17th November 2024
+# Updated:  23rd November 2024
 #
 # ######################################################################## #
 
@@ -76,6 +76,13 @@ if(MSVC)
 
 		set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 	endif(MSVC_USE_MT)
+else(MSVC)
+
+	if(MSVC_USE_MT)
+
+		# this here just to absorb warning about not using `MSVC_USE_MT` (to
+		# enable **prepare_cmake.sh** to be simple)
+	endif(MSVC_USE_MT)
 endif(MSVC)
 
 
 
@@ -1,6 +1,23 @@
 # xTests - History
 
 
+31st December 2024 - 0.26.0-beta1
+---------------------------------
+
+ * now uses `stlsoft::integral_traits<>` for integer test macros (in C++) to allow for custom integral types to be tested;
+ * `temp_file` now takes a `hint_dir` parameter to allow specification of directory for (temporary) file;
+ * added missing test macros `XTESTS_TEST_FLOATINGPOINT_GREATER()`, `XTESTS_TEST_FLOATINGPOINT_GREATER_OR_EQUAL()`, `XTESTS_TEST_FLOATINGPOINT_LESS()`, `XTESTS_TEST_FLOATINGPOINT_LESS_OR_EQUAL()`;
+ * added macro `XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY()`, which allows for a unified command-line parsing in test programs;
+ * added terse forms of macros, available by including **xtests/terse-api.h**;
+ * `XTESTS_COMMANDLINE_PARSE_VERBOSITY()` now also recognises, if the command-line argument `"--verbosity= . . ."` is not found, the enviroment variables `"XTESTS_VERBOSITY"` and `"TEST_VERBOSITY"`;
+ * added test programs **test.scratch.all_failure_messages**, **test.scratch.basics2**, **test.scratch.custom_integral_types**,
+ * substantial internal refactoring;
+ * minor tidying to CMake facilities;
+ * minor improvements to examples;
+ * minor improvements to project boilerplate files;
+ * updated **STLSoft** constructs, incl. macros;
+
+
 18th November 2024 - 0.25.4
 ---------------------------
 
 
@@ -103,7 +103,7 @@ The primary choice for installation is by use of **CMake**.
 
 
    ```bash
-   $ sudo cmake --install ./_build --config Release
+   $ sudo cmake --install ${SIS_CMAKE_BUILD_DIR:-./_build} --config Release
    ```
 
 7. Then to use the library, it is a simple matter as follows:
 
@@ -2,6 +2,7 @@
 
 | Date                  | News Item                       |
 | --------------------- | ------------------------------- |
+| 31st December 2024    |   xTests 0.26.0-beta1 released  |
 | 18th November 2024    |   xTests 0.25.4 released        |
 | 25th October 2024     |   xTests 0.25.3 released        |
 | 22nd October 2024     |   xTests 0.25.2 released        |
 
@@ -295,11 +295,13 @@ int factorial(int v)
 
     switch (v)
     {
-        case 0:
-        case 1:
-            return 1;
-        default:
-            return v * factorial(v - 1);
+      case 0:
+      case 1:
+
+          return 1;
+      default:
+
+          return v * factorial(v - 1);
     }
 }
 
@@ -341,7 +343,7 @@ int main(int argc, char* argv[])
 }
 ```
 
-**NOTE**: the language shown in **C**, but a **C++** version of this example program would be very similar. **C++** test programs have additiona support for facilities such as the throwing of exceptions.
+**NOTE**: the language shown is **C**, but a **C++** version of this example program would be very similar. **C++** test programs have additiona support for facilities such as the throwing of exceptions.
 
 
 ## Project Information
@@ -364,23 +366,23 @@ If you'd like to help out with the project, please raise an issue via [GitHub Pa
 
 #### STLSoft <!-- omit in toc -->
 
-**xTests** depends on the **STLSoft** libraries, version 1.9.136 (or later). Version 1.10.6 (or later) is recommended.
+**xTests** depends on the **STLSoft** libraries, version 1.11.1 (or later):
 
-* [STLSoft 1.9](http://github.com/synesissoftware/STLSoft-1.9/)
-* [STLSoft 1.10](http://github.com/synesissoftware/STLSoft-1.10/) (Recommended)
+* [STLSoft 1.11](http://github.com/synesissoftware/STLSoft-1.11/);
 
 
 ### Related projects
 
 Projects in which **xTests** is used for testing include:
 
 * [**b64**](https://github.com/synesissoftware/b64)
+* [**CLASP**](https://github.com/synesissoftware/CLASP)
 * [**cstring**](https://github.com/synesissoftware/cstring)
 * [**FastFormat**](https://github.com/synesissoftware/FastFormat)
+* [**libCLImate**](https://github.com/synesissoftware/libCLImate)
 * [**libpath**](https://github.com/synesissoftware/libpath)
 * [**Pantheios**](https://github.com/synesissoftware/Pantheios)
 * [**recls**](https://github.com/synesissoftware/recls)
-* [**shwild**](https://github.com/synesissoftware/shwild)
 * [**UNIXem**](https://github.com/synesissoftware/UNIXem)
 
 
 
@@ -1,2 +1,2 @@
 # SIS:AUTO_GENERATED: Remove this line if you edit the file, otherwise it will be overwritten
-define_example_program(example.c.factorial example.c.factorial.c)
+define_example_program(example.c.factorial main.c)
@@ -1,11 +1,11 @@
 /* /////////////////////////////////////////////////////////////////////////
- * File:    examples/c/example.c.factorial/example.c.factorial.c
+ * File:    examples/c/example.c.factorial/main.c
  *
  * Purpose: Example of use of separate test-case function(s) and in-runner
  *          test case(s).
  *
  * Created: 7th December 2023
- * Updated: 13th October 2024
+ * Updated: 31st December 2024
  *
  * ////////////////////////////////////////////////////////////////////// */
 
@@ -32,13 +32,13 @@ int factorial(int v)
 
     switch (v)
     {
-        case 0:
-        case 1:
+    case 0:
+    case 1:
 
-            return 1;
-        default:
+        return 1;
+    default:
 
-            return v * factorial(v - 1);
+        return v * factorial(v - 1);
     }
 }
 
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
     int retCode = EXIT_SUCCESS;
     int verbosity;
 
-    XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);
+    XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);
 
     if (XTESTS_START_RUNNER("example.factorial.factorial", verbosity))
     {
 
@@ -1,2 +1,2 @@
 # SIS:AUTO_GENERATED: Remove this line if you edit the file, otherwise it will be overwritten
-define_automated_test_program(example.c.runner example.c.runner.c)
+define_automated_test_program(example.c.runner main.c)
@@ -1,10 +1,10 @@
 /* /////////////////////////////////////////////////////////////////////////
- * File:    examples/c/example.c.runner/example.c.runner.c
+ * File:    examples/c/example.c.runner/main.c
  *
  * Purpose: Example of in-runner test cases.
  *
  * Created: 20th February 2008
- * Updated: 28th September 2024
+ * Updated: 31st December 2024
  *
  * ////////////////////////////////////////////////////////////////////// */
 
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
     int retCode = EXIT_SUCCESS;
     int verbosity;
 
-    XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);
+    XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);
 
     if (XTESTS_START_RUNNER("example.c.runner", verbosity))
     {
 
@@ -1,2 +1,2 @@
 # SIS:AUTO_GENERATED: Remove this line if you edit the file, otherwise it will be overwritten
-define_automated_test_program(example.c.tests example.c.tests.c)
+define_automated_test_program(example.c.tests main.c)
@@ -1,10 +1,10 @@
 /* /////////////////////////////////////////////////////////////////////////
- * File:    examples/c/example.c.tests/example.c.tests.c
+ * File:    examples/c/example.c.tests/entry.c
  *
  * Purpose: Example of use of separate test-case functions.
  *
  * Created: 20th February 2008
- * Updated: 28th September 2024
+ * Updated: 31st December 2024
  *
  * ////////////////////////////////////////////////////////////////////// */
 
@@ -43,7 +43,7 @@ int main(int argc, char* argv[])
     int retCode = EXIT_SUCCESS;
     int verbosity;
 
-    XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);
+    XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);
 
     if (XTESTS_START_RUNNER("example.c.tests", verbosity))
     {
 
@@ -5,4 +5,4 @@ if(MSVC)
 		list(APPEND X_MSVC_CUSTOM_WARNINGS_TO_BE_SUPPRESSED 4459)
 	endif()
 endif(MSVC)
-define_automated_test_program(example.cpp.temp_directory example.cpp.temp_directory.cpp)
+define_automated_test_program(example.cpp.temp_directory main.cpp)
@@ -1,10 +1,10 @@
 /* /////////////////////////////////////////////////////////////////////////
- * File:    examples/cpp/example.cpp.temp_directory/example.cpp.temp_directory.cpp
+ * File:    examples/cpp/example.cpp.temp_directory/main.cpp
  *
  * Purpose: Example use of `xtests::cpp::util::temp_directory`.
  *
  * Created: ... mid 2010s ...
- * Updated: 22nd October 2024
+ * Updated: 31st December 2024
  *
  * ////////////////////////////////////////////////////////////////////// */
 
@@ -33,9 +33,8 @@ namespace {
 
 using xtests::cpp::util::temp_directory;
 
-typedef platformstl::filesystem_traits<char>    fs_traits_t;
-
-} /* anonymous namespace */
+typedef platformstl::filesystem_traits<char>                fs_traits_t;
+} // anonymous namespace
 
 
 /* /////////////////////////////////////////////////////////////////////////
@@ -44,7 +43,9 @@ typedef platformstl::filesystem_traits<char>    fs_traits_t;
 
 int main(int argc, char* argv[])
 {
-    char const* const   progran_name    =   platformstl::platformstl_C_get_executable_name_from_path(argv[0]).ptr;
+    /* 1: command-line handling */
+
+    char const* const   program_name    =   platformstl::platformstl_C_get_executable_name_from_path(argv[0]).ptr;
     char const*         hint_dir;
 
     { for (int i = 1; i != argc; ++i)
@@ -53,7 +54,7 @@ int main(int argc, char* argv[])
         {
             std::cout
                 << "USAGE: "
-                << progran_name
+                << program_name
                 << " [ <hint-directory> ]"
                 << std::endl;
 
@@ -74,15 +75,18 @@ int main(int argc, char* argv[])
     default:
 
         std::cerr
-            << progran_name
+            << program_name
             << ": too many arguments; use --help for usage"
             << std::endl;
 
         return EXIT_FAILURE;
     }
 
+
+    /* 2: various uses of `xtests::cpp::util::temp_directory` */
+
     {
-        std::cout << "temp_directory::None : " << std::endl;
+        std::cout << "temp_directory::None :" << std::endl;
 
         temp_directory tf(temp_directory::None);
 
@@ -93,7 +97,7 @@ int main(int argc, char* argv[])
     }
 
     {
-        std::cout << "temp_directory::RemoveOnClose : " << std::endl;
+        std::cout << "temp_directory::RemoveOnClose :" << std::endl;
 
         temp_directory tf(temp_directory::RemoveOnClose);
 
@@ -104,7 +108,7 @@ int main(int argc, char* argv[])
     }
 
     {
-        std::cout << "temp_directory::RemoveOnOpen : " << std::endl;
+        std::cout << "temp_directory::RemoveOnOpen :" << std::endl;
 
         temp_directory tf(temp_directory::RemoveOnOpen);
 
@@ -115,7 +119,7 @@ int main(int argc, char* argv[])
     }
 
     {
-        std::cout << "temp_directory::RemoveOnClose | temp_directory::RemoveOnOpen : " << std::endl;
+        std::cout << "temp_directory::RemoveOnClose | temp_directory::RemoveOnOpen :" << std::endl;
 
         temp_directory tf(temp_directory::RemoveOnClose | temp_directory::RemoveOnOpen);
 
 
@@ -5,4 +5,4 @@ if(MSVC)
 		list(APPEND X_MSVC_CUSTOM_WARNINGS_TO_BE_SUPPRESSED 4459)
 	endif()
 endif(MSVC)
-define_automated_test_program(example.cpp.temp_file example.cpp.temp_file.cpp)
+define_automated_test_program(example.cpp.temp_file main.cpp)
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# SIS:AUTO_GENERATED: Remove this line if you edit the file, otherwise it will be overwritten`
`2`		`-define_example_program(example.c.factorial example.c.factorial.c)`
	`2`	`+define_example_program(example.c.factorial main.c)`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`/* /////////////////////////////////////////////////////////////////////////`
`2`		`- * File: examples/c/example.c.factorial/example.c.factorial.c`
	`2`	`+ * File: examples/c/example.c.factorial/main.c`
`3`	`3`	`*`
`4`	`4`	`* Purpose: Example of use of separate test-case function(s) and in-runner`
`5`	`5`	`* test case(s).`
`6`	`6`	`*`
`7`	`7`	`* Created: 7th December 2023`
`8`		`- * Updated: 13th October 2024`
	`8`	`+ * Updated: 31st December 2024`
`9`	`9`	`*`
`10`	`10`	`* ////////////////////////////////////////////////////////////////////// */`
`11`	`11`
`@@ -32,13 +32,13 @@ int factorial(int v)`
`32`	`32`
`33`	`33`	`switch (v)`
`34`	`34`	`{`
`35`		`- case 0:`
`36`		`- case 1:`
	`35`	`+ case 0:`
	`36`	`+ case 1:`
`37`	`37`
`38`		`- return 1;`
`39`		`- default:`
	`38`	`+ return 1;`
	`39`	`+ default:`
`40`	`40`
`41`		`- return v * factorial(v - 1);`
	`41`	`+ return v * factorial(v - 1);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -62,7 +62,7 @@ int main(int argc, char* argv[])`
`62`	`62`	`int retCode = EXIT_SUCCESS;`
`63`	`63`	`int verbosity;`
`64`	`64`
`65`		`- XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);`
	`65`	`+ XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);`
`66`	`66`
`67`	`67`	`if (XTESTS_START_RUNNER("example.factorial.factorial", verbosity))`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# SIS:AUTO_GENERATED: Remove this line if you edit the file, otherwise it will be overwritten`
`2`		`-define_automated_test_program(example.c.runner example.c.runner.c)`
	`2`	`+define_automated_test_program(example.c.runner main.c)`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`/* /////////////////////////////////////////////////////////////////////////`
`2`		`- * File: examples/c/example.c.runner/example.c.runner.c`
	`2`	`+ * File: examples/c/example.c.runner/main.c`
`3`	`3`	`*`
`4`	`4`	`* Purpose: Example of in-runner test cases.`
`5`	`5`	`*`
`6`	`6`	`* Created: 20th February 2008`
`7`		`- * Updated: 28th September 2024`
	`7`	`+ * Updated: 31st December 2024`
`8`	`8`	`*`
`9`	`9`	`* ////////////////////////////////////////////////////////////////////// */`
`10`	`10`
`@@ -33,7 +33,7 @@ int main(int argc, char* argv[])`
`33`	`33`	`int retCode = EXIT_SUCCESS;`
`34`	`34`	`int verbosity;`
`35`	`35`
`36`		`- XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);`
	`36`	`+ XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);`
`37`	`37`
`38`	`38`	`if (XTESTS_START_RUNNER("example.c.runner", verbosity))`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`/* /////////////////////////////////////////////////////////////////////////`
`2`		`- * File: examples/c/example.c.tests/example.c.tests.c`
	`2`	`+ * File: examples/c/example.c.tests/entry.c`
`3`	`3`	`*`
`4`	`4`	`* Purpose: Example of use of separate test-case functions.`
`5`	`5`	`*`
`6`	`6`	`* Created: 20th February 2008`
`7`		`- * Updated: 28th September 2024`
	`7`	`+ * Updated: 31st December 2024`
`8`	`8`	`*`
`9`	`9`	`* ////////////////////////////////////////////////////////////////////// */`
`10`	`10`
`@@ -43,7 +43,7 @@ int main(int argc, char* argv[])`
`43`	`43`	`int retCode = EXIT_SUCCESS;`
`44`	`44`	`int verbosity;`
`45`	`45`
`46`		`- XTESTS_COMMANDLINE_PARSE_VERBOSITY(argc, argv, &verbosity);`
	`46`	`+ XTESTS_COMMANDLINE_PARSE_HELP_OR_VERBOSITY(argc, argv, &verbosity);`
`47`	`47`
`48`	`48`	`if (XTESTS_START_RUNNER("example.c.tests", verbosity))`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`/* /////////////////////////////////////////////////////////////////////////`
`2`		`- * File: examples/cpp/example.cpp.temp_directory/example.cpp.temp_directory.cpp`
	`2`	`+ * File: examples/cpp/example.cpp.temp_directory/main.cpp`
`3`	`3`	`*`
`4`	`4`	* Purpose: Example use of `xtests::cpp::util::temp_directory`.
`5`	`5`	`*`
`6`	`6`	`* Created: ... mid 2010s ...`
`7`		`- * Updated: 22nd October 2024`
	`7`	`+ * Updated: 31st December 2024`
`8`	`8`	`*`
`9`	`9`	`* ////////////////////////////////////////////////////////////////////// */`
`10`	`10`
`@@ -33,9 +33,8 @@ namespace {`
`33`	`33`
`34`	`34`	`using xtests::cpp::util::temp_directory;`
`35`	`35`
`36`		`-typedef platformstl::filesystem_traits<char> fs_traits_t;`
`37`		`-`
`38`		`-} /* anonymous namespace */`
	`36`	`+typedef platformstl::filesystem_traits<char> fs_traits_t;`
	`37`	`+} // anonymous namespace`
`39`	`38`
`40`	`39`
`41`	`40`	`/* /////////////////////////////////////////////////////////////////////////`
`@@ -44,7 +43,9 @@ typedef platformstl::filesystem_traits<char> fs_traits_t;`
`44`	`43`
`45`	`44`	`int main(int argc, char* argv[])`
`46`	`45`	`{`
`47`		`- char const* const progran_name = platformstl::platformstl_C_get_executable_name_from_path(argv[0]).ptr;`
	`46`	`+ /* 1: command-line handling */`
	`47`	`+`
	`48`	`+ char const* const program_name = platformstl::platformstl_C_get_executable_name_from_path(argv[0]).ptr;`
`48`	`49`	`char const* hint_dir;`
`49`	`50`
`50`	`51`	`{ for (int i = 1; i != argc; ++i)`
`@@ -53,7 +54,7 @@ int main(int argc, char* argv[])`
`53`	`54`	`{`
`54`	`55`	`std::cout`
`55`	`56`	`<< "USAGE: "`
`56`		`- << progran_name`
	`57`	`+ << program_name`
`57`	`58`	`<< " [ <hint-directory> ]"`
`58`	`59`	`<< std::endl;`
`59`	`60`
`@@ -74,15 +75,18 @@ int main(int argc, char* argv[])`
`74`	`75`	`default:`
`75`	`76`
`76`	`77`	`std::cerr`
`77`		`- << progran_name`
	`78`	`+ << program_name`
`78`	`79`	`<< ": too many arguments; use --help for usage"`
`79`	`80`	`<< std::endl;`
`80`	`81`
`81`	`82`	`return EXIT_FAILURE;`
`82`	`83`	`}`
`83`	`84`
	`85`	`+`
	`86`	+ /* 2: various uses of `xtests::cpp::util::temp_directory` */
	`87`	`+`
`84`	`88`	`{`
`85`		`- std::cout << "temp_directory::None : " << std::endl;`
	`89`	`+ std::cout << "temp_directory::None :" << std::endl;`
`86`	`90`
`87`	`91`	`temp_directory tf(temp_directory::None);`
`88`	`92`
`@@ -93,7 +97,7 @@ int main(int argc, char* argv[])`
`93`	`97`	`}`
`94`	`98`
`95`	`99`	`{`
`96`		`- std::cout << "temp_directory::RemoveOnClose : " << std::endl;`
	`100`	`+ std::cout << "temp_directory::RemoveOnClose :" << std::endl;`
`97`	`101`
`98`	`102`	`temp_directory tf(temp_directory::RemoveOnClose);`
`99`	`103`
`@@ -104,7 +108,7 @@ int main(int argc, char* argv[])`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`{`
`107`		`- std::cout << "temp_directory::RemoveOnOpen : " << std::endl;`
	`111`	`+ std::cout << "temp_directory::RemoveOnOpen :" << std::endl;`
`108`	`112`
`109`	`113`	`temp_directory tf(temp_directory::RemoveOnOpen);`
`110`	`114`
`@@ -115,7 +119,7 @@ int main(int argc, char* argv[])`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`{`
`118`		`- std::cout << "temp_directory::RemoveOnClose \| temp_directory::RemoveOnOpen : " << std::endl;`
	`122`	`+ std::cout << "temp_directory::RemoveOnClose \| temp_directory::RemoveOnOpen :" << std::endl;`
`119`	`123`
`120`	`124`	`temp_directory tf(temp_directory::RemoveOnClose \| temp_directory::RemoveOnOpen);`
`121`	`125`