Merge pull request #53 from ronaaron/ttf

Update stb_truetype (ttf font support) and stb_rect_pack while paving the way for easy updates in the future.

Author: dumblob

nuklear.h

@@ -1,6 +1,6 @@
 {
   "name": "nuklear",
-  "version": "4.01.5",
+  "version": "4.01.6",
   "repo": "Immediate-Mode-UI/Nuklear",
   "description": "A small ANSI C gui toolkit",
   "keywords": ["gl", "ui", "toolkit"],

package.json

@@ -8,6 +8,7 @@
 ///    - [yy]: Minor version with non-breaking API and library changes
 ///    - [zz]: Bug fix version with no direct changes to API
 ///
+/// - 2020/02/06 (4.01.6) - Update stb_truetype.h and stb_rect_pack.h and separate them
 /// - 2019/12/10 (4.01.5) - Fix off-by-one error in NK_INTERSECT
 /// - 2019/10/09 (4.01.4) - Fix bug for autoscrolling in nk_do_edit
 /// - 2019/09/20 (4.01.3) - Fixed a bug wherein combobox cannot be closed by clicking the header

src/CHANGELOG

@@ -2,12 +2,15 @@
 import fnmatch
 import os.path
 import sys
+import re
 
 def print_help():
     print(
-"""usage: python single_header_packer.py --macro <macro> [--intro <files>] --pub <files> --priv <files> [--outro <files>]
+"""usage: python single_header_packer.py --macro <macro> [--intro <files>] --extern <files> --pub <files> --priv1 <files> --priv2 <files> [--outro <files>]
 
        where <files> can be a comma-separated list of files. e.g. --priv *.c,inc/*.h
+       
+       The 'extern' files are placed between 'priv1' and 'priv2'.
 
        The resulting code is packed as follows:
 
@@ -70,6 +73,9 @@ def omit_includes(str, files):
             str = str.replace("#include <" + fname + ">", "");
     return str
 
+def fix_comments(str):
+    return re.sub(r"//(.*)(\n|$)", "/* \\1 */\\2", str)
+
 # Main start
 # ==========
 
@@ -79,8 +85,9 @@ def omit_includes(str, files):
 
 intro_files = []
 pub_files = []
-priv_files = []
-outro_files = []
+priv_files1 = []
+outro_files2 = []
+extern_files = []
 cur_arg = 1
 macro = ""
 
@@ -99,9 +106,15 @@ def omit_includes(str, files):
     elif sys.argv[cur_arg] == "--pub":
         cur_arg += 1
         pub_files = parse_files(sys.argv[cur_arg])
-    elif sys.argv[cur_arg] == "--priv":
+    elif sys.argv[cur_arg] == "--priv1":
+        cur_arg += 1
+        priv_files1 = parse_files(sys.argv[cur_arg])
+    elif sys.argv[cur_arg] == "--priv2":
         cur_arg += 1
-        priv_files = parse_files(sys.argv[cur_arg])
+        priv_files2 = parse_files(sys.argv[cur_arg])
+    elif sys.argv[cur_arg] == "--extern":
+        cur_arg += 1
+        extern_files = parse_files(sys.argv[cur_arg])
     elif sys.argv[cur_arg] == "--outro":
         cur_arg += 1
         outro_files = parse_files(sys.argv[cur_arg])
@@ -134,9 +147,17 @@ def omit_includes(str, files):
 
 print(os.linesep + "#ifdef " + macro + "_IMPLEMENTATION");
 print("");
-for f in priv_files:
+
+for f in priv_files1:
     print(omit_includes(open(f, 'r').read(),
-                        pub_files + priv_files))
+                        pub_files + priv_files1 + priv_files2 + extern_files))
+for f in extern_files:
+    print(fix_comments(open(f, 'r').read()))
+
+for f in priv_files2:
+    print(omit_includes(open(f, 'r').read(),
+                        pub_files + priv_files1 + priv_files2 + extern_files))
+
 print("#endif /* " + macro + "_IMPLEMENTATION */");
 
 print(os.linesep + "/*")

src/build.py

@@ -5461,4 +5461,16 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
 #define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0)
 #endif
 
+#ifdef NK_IMPLEMENTATION
+#define STB_RECT_PACK_IMPLEMENTATION
+#define STB_TRUETYPE_IMPLEMENTATION
+#endif
+
+#ifndef STBTT_malloc
+static nk_handle fictional_handle = {0};
+
+#define STBTT_malloc(x,u)  nk_malloc( fictional_handle, 0, x ) 
+#define STBTT_free(x,u)    nk_mfree( fictional_handle , x)
+#endif
+
 #endif /* NK_NUKLEAR_H_ */