Improved Installation section in README.md

3 files changed, 21 insertions, 39 deletions

diff --git a/README.md b/README.md
index 3ff00e52..69c51417 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ List of contents
 - **Uniform, easy-to-learn API** - Just include the headers and you are good. The API and functionality resembles c++ STL and is fully listed in the docs. Intuitive method/type names and uniform usage across the various containers.
 - **No signed/unsigned mixing** - Unsigned sizes and indices mixed with signed for comparison and calculation is asking for trouble. STC only uses signed numbers in the API for this reason.
 - **Small footprint** - Small source code and generated executables. The executable from the example below using *four different* container types is only ***19 Kb in size*** compiled with gcc -O3 -s on Linux.
-- **Dual mode compilation** - By default it is a simple header-only library with inline and static methods only, but you can easily switch to create a traditional library with shared symbols, without changing existing source files. See the Installation section.
+- **Dual mode compilation** - By default it is a simple header-only library with inline and static methods only, but you can easily switch to create a traditional library with shared symbols, without changing existing source files. See the [installation section](#installation).
 - **No callback functions** - All passed template argument functions/macros are directly called from the implementation, no slow callbacks which requires storage.
 - **Compiles with C++ and C99** - C code can be compiled with C++ (container element types must be POD).
 - **Forward declaration** - Templated containers may be [forward declared](#forward-declarations) without including the full API/implementation.
@@ -333,49 +333,29 @@ After erasing the elements found:
 ---
 ## Installation
 
-*NEEDS REWRITE!*
-Because it is headers-only, headers can simply be included in your program. By default, functions are static
-(some inlined). You may add the *include* folder to the **CPATH** environment variable to
-let GCC, Clang, and TinyC locate the headers.
+STC is primarily a "headers-only" library, so most headers can simply be included in your program. By default,
+all "templated" functions are static (many inlined). If you add the STC *include* folder to the **CPATH**
+environment variable, GCC, Clang, and TinyC will locate the headers automatically.
 
-If containers are used across several translation units with common instantiated container types, it is 
-recommended to build as a "library" with external linking to minimize executable size. To enable this,
-specify `-DSTC_HEADER` as compiler option in your build environment. Next, place all the instantiations
-of the containers used inside a single C-source file as in the example below, and `#define STC_IMPLEMENT` at top. 
-You may also cherry-pick shared linking mode on individual containers by `#define i_header` and
-`#define i_implement`, or force static symbols by `#define i_static` before container includes.
-
-As a special case, there may be non-templated functions in templated containers that should be implemented only
-once and if needed. Currently, define `i_import` before including **cregex** or **utf8** to implement them.
-
-It is possible to generate single headers by executing the python script `src/singleheader.py header-file > single`.
-
-Conveniently, `src\libstc.c` implements non-templated functions as shared symbols for **cstr**, **csview**,
-**cbits** and **crand**. When building in shared mode (-DSTC_HEADER), you may include this file in your project,
-or define your own, e.g.:
+The templated container functions are defined with static linking by default, which is normally optimal
+for both performance and compiled binary size. However, some common container type instances, e.g. `cvec_int`
+may be used in several translation units. When they are used in more than 3-4, consider creating a separate
+header file for them [as described here](#1-include-as-a-header-file). Now it will use shared
+linking, so *one* c-file must implement the templated container, e.g.:
 ```c
-// stc_libs.c
-#define STC_IMPLEMENT // implement all the following as shared objects
 #define i_implement
-#include <stc/cstr.h>
-#include "Point.h"
-
-#define i_key int
-#define i_val int
-#define i_tag ii
-#include <stc/cmap.h>  // cmap_ii: int => int
+#include "cvec_int.h"
+```
+The non-templated string type **cstr** uses shared linking by default, but can have static linking instead by
+`#define i_static`. Same for the string-view type **csview**, but most of its functions are static inlined, so
+linking specifications and implementation are only needed for a few lesser used functions.
 
-#define i_key int64_t
-#define i_tag ix
-#include <stc/cset.h>  // cset_ix
+Conveniently, `src\libstc.c` implements all the non-templated functions with shared linking for **cstr**,
+**csview**, **cregex**, **utf8**, and **crand**.
 
-#define i_key int
-#include <stc/cvec.h>  // cvec_int
+As a special case, you can `#define i_import` before including **cregex** or **cstr** to implement the dependent
+**utf8** functions (proper utf8 case conversions, etc.). Or link with src\libstc.
 
-#define i_key Point
-#define i_tag pnt
-#include <stc/clist.h> // clist_pnt
-```
 ---
 ## Specifying template parameters
 
diff --git a/include/stc/cstr.h b/include/stc/cstr.h
index 2648e267..f12d29b6 100644
--- a/include/stc/cstr.h
+++ b/include/stc/cstr.h
@@ -179,7 +179,7 @@ extern void cstr_lowercase(cstr* self);
 extern void cstr_uppercase(cstr* self);
 extern bool cstr_valid_utf8(const cstr* self);
 
-// other utf8 
+// utf8 functions not depending on src/utf8code.c:
 
 STC_INLINE intptr_t cstr_u8_size(const cstr* self) 
     { return utf8_size(cstr_str(self)); }
diff --git a/src/libstc.c b/src/libstc.c
index 7b49540a..462c97c4 100644
--- a/src/libstc.c
+++ b/src/libstc.c
@@ -2,6 +2,8 @@
 #include "../include/stc/cregex.h" /* cstr. utf8, and cregex */

 #define i_implement

 #include "../include/stc/csview.h"

+#define i_implement

+#include "../include/stc/crand.h"

 #if __STDC_VERSION__ >= 201112L

 #  define i_implement

 #  include "../include/c11/fmt.h"