Fixed the color problem of the editor

update stb_truetype

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: rxi

.gitignore

@@ -0,0 +1,5 @@
+src/*.o
+src/*/*.o
+src/*/*/*.o
+lite
+*.txt

Makefile

@@ -0,0 +1,105 @@
+#
+# Makefile generated by:
+# codebench 0.55
+#
+# Project: lite
+#
+# Created on: 15-12-2021 22:58:23
+#
+#
+
+###################################################################
+##
+##////  Objects
+##
+###################################################################
+
+lite_OBJ := \
+	 src/lib/stb/stb_truetype.o src/api/renderer.o src/api/renderer_font.o \
+	 src/api/system.o src/main.o src/api/api.o \
+	 src/rencache.o src/renderer.o
+
+
+###################################################################
+##
+##////  Variables and Environment
+##
+###################################################################
+
+CC := gcc:bin/gcc
+
+INCPATH := -I. -Isrc
+
+CFLAGS := $(INCPATH) -D__USE_INLINE__ -Wall -Werror -Wwrite-strings
+
+
+###################################################################
+##
+##////  General rules
+##
+###################################################################
+
+.PHONY: all all-before all-after clean clean-custom realclean
+
+all: all-before lite all-after
+
+all-before:
+#	You can add rules here to execute before the project is built
+
+all-after:
+#	You can add rules here to execute after the project is built
+
+clean: clean-custom
+	@echo "Cleaning compiler objects..."
+	@rm -f  $(lite_OBJ)
+
+realclean:
+	@echo "Cleaning compiler objects and targets..."
+	@rm -f  $(lite_OBJ) lite
+
+
+###################################################################
+##
+##////  Targets
+##
+###################################################################
+
+lite: $(lite_OBJ)
+	@echo "Linking lite"
+	@gcc:bin/gcc -o lite $(lite_OBJ) -llua -lSDL2 -lpthread -lauto
+	@echo "Removing stale debug target: lite"
+	@rm -f lite.debug
+
+
+###################################################################
+##
+##////  Standard rules
+##
+###################################################################
+
+# A default rule to make all the objects listed below
+# because we are hiding compiler commands from the output
+
+.c.o:
+	@echo "Compiling $<"
+	@$(CC) -c $< -o $*.o $(CFLAGS)
+
+src/api/api.o: src/api/api.c
+
+src/api/renderer.o: src/api/renderer.c src/api/api.h src/renderer.h \
+	
+
+src/api/renderer_font.o: src/api/renderer_font.c src/api/api.h src/renderer.h \
+	
+
+src/api/system.o: src/api/system.c src/api/api.h
+
+src/main.o: src/main.c src/api/api.h src/renderer.h \
+	
+
+src/rencache.o: src/rencache.c
+
+src/renderer.o: src/renderer.c src/lib/stb/stb_truetype.h
+
+src/lib/stb/stb_truetype.o: src/lib/stb/stb_truetype.c
+

README.md

@@ -5,6 +5,7 @@ A lightweight text editor written in Lua
 
 * **[Get lite](https://github.com/rxi/lite/releases/latest)** — Download
   for Windows and Linux
+* **[Get started](doc/usage.md)** — A quick overview on how to get started
 * **[Get plugins](https://github.com/rxi/lite-plugins)** — Add additional
   functionality
 * **[Get color themes](https://github.com/rxi/lite-colors)** — Add additional colors
@@ -23,9 +24,10 @@ The editor can be customized by making changes to the
 [user module](data/user/init.lua).
 
 ## Building
-You can build the project yourself on Linux using the provided `build.sh`
-script. Note that the project does not need to be rebuilt if you are only making
-changes to the Lua portion of the code.
+You can build the project yourself on Linux using the `build.sh` script
+or on Windows using the `build.bat` script *([MinGW](https://nuwen.net/mingw.html) is required)*.
+Note that the project does not need to be rebuilt if you are only making changes
+to the Lua portion of the code.
 
 ## Contributing
 Any additional functionality that can be added through a plugin should be done

build.bat

@@ -0,0 +1,16 @@
+@echo off
+
+rem download this:
+rem https://nuwen.net/mingw.html
+
+echo compiling (windows)...
+
+windres res.rc -O coff -o res.res
+gcc src/*.c src/api/*.c src/lib/lua52/*.c src/lib/stb/*.c^
+    -O3 -s -std=gnu11 -fno-strict-aliasing -Isrc -DLUA_USE_POPEN^
+    -Iwinlib/SDL2-2.0.10/x86_64-w64-mingw32/include^
+    -lmingw32 -lm -lSDL2main -lSDL2 -Lwinlib/SDL2-2.0.10/x86_64-w64-mingw32/lib^
+    -mwindows res.res^
+    -o lite.exe
+
+echo done

data/core/commands/doc.lua

@@ -160,7 +160,9 @@ local commands = {
     local line1, _, line2 = doc():get_selection(true)
     if line1 == line2 then line2 = line2 + 1 end
     local text = doc():get_text(line1, 1, line2, math.huge)
-    text = text:gsub("\n[\t ]*", " ")
+    text = text:gsub("(.-)\n[\t ]*", function(x)
+      return x:find("^%s*$") and x or x .. " "
+    end)
     doc():insert(line1, 1, text)
     doc():remove(line1, #text + 1, line2, math.huge)
     if doc():has_selection() then

data/core/docview.lua

@@ -192,28 +192,42 @@ function DocView:scroll_to_make_visible(line, col)
 end
 
 
+local function mouse_selection(doc, clicks, line1, col1, line2, col2)
+  local swap = line2 < line1 or line2 == line1 and col2 <= col1
+  if swap then
+    line1, col1, line2, col2 = line2, col2, line1, col1
+  end
+  if clicks == 2 then
+    line1, col1 = translate.start_of_word(doc, line1, col1)
+    line2, col2 = translate.end_of_word(doc, line2, col2)
+  elseif clicks == 3 then
+    if line2 == #doc.lines and doc.lines[#doc.lines] ~= "\n" then
+      doc:insert(math.huge, math.huge, "\n")
+    end
+    line1, col1, line2, col2 = line1, 1, line2 + 1, 1
+  end
+  if swap then
+    return line2, col2, line1, col1
+  end
+  return line1, col1, line2, col2
+end
+
+
 function DocView:on_mouse_pressed(button, x, y, clicks)
   local caught = DocView.super.on_mouse_pressed(self, button, x, y, clicks)
   if caught then
     return
   end
-  local line, col = self:resolve_screen_position(x, y)
-  if clicks == 2 then
-    local line1, col1 = translate.start_of_word(self.doc, line, col)
-    local line2, col2 = translate.end_of_word(self.doc, line, col)
-    self.doc:set_selection(line2, col2, line1, col1)
-  elseif clicks == 3 then
-    if line == #self.doc.lines then
-      self.doc:insert(math.huge, math.huge, "\n")
-    end
-    self.doc:set_selection(line + 1, 1, line, 1)
-  else
-    local line2, col2
   if keymap.modkeys["shift"] then
-      line2, col2 = select(3, self.doc:get_selection())
+    if clicks == 1 then
+      local line1, col1 = select(3, self.doc:get_selection())
+      local line2, col2 = self:resolve_screen_position(x, y)
+      self.doc:set_selection(line2, col2, line1, col1)
     end
-    self.doc:set_selection(line, col, line2, col2)
-    self.mouse_selecting = true
+  else
+    local line, col = self:resolve_screen_position(x, y)
+    self.doc:set_selection(mouse_selection(self.doc, clicks, line, col, line, col))
+    self.mouse_selecting = { line, col, clicks = clicks }
   end
   self.blink_timer = 0
 end
@@ -229,16 +243,17 @@ function DocView:on_mouse_moved(x, y, ...)
   end
 
   if self.mouse_selecting then
-    local _, _, line2, col2 = self.doc:get_selection()
-    local line1, col1 = self:resolve_screen_position(x, y)
-    self.doc:set_selection(line1, col1, line2, col2)
+    local l1, c1 = self:resolve_screen_position(x, y)
+    local l2, c2 = table.unpack(self.mouse_selecting)
+    local clicks = self.mouse_selecting.clicks
+    self.doc:set_selection(mouse_selection(self.doc, clicks, l1, c1, l2, c2))
   end
 end
 
 
 function DocView:on_mouse_released(button)
   DocView.super.on_mouse_released(self, button)
-  self.mouse_selecting = false
+  self.mouse_selecting = nil
 end
 
 

data/plugins/language_lua.lua

@@ -13,6 +13,7 @@ syntax.add {
     { pattern = "-?0x%x+",                type = "number"   },
     { pattern = "-?%d+[%d%.eE]*",         type = "number"   },
     { pattern = "-?%.?%d+",               type = "number"   },
+    { pattern = "<%a+>",                  type = "keyword2" },
     { pattern = "%.%.%.?",                type = "operator" },
     { pattern = "[<>~=]=",                type = "operator" },
     { pattern = "[%+%-=/%*%^%%#<>]",      type = "operator" },

data/plugins/language_python.lua

@@ -1,7 +1,7 @@
 local syntax = require "core.syntax"
 
 syntax.add {
-  files = "%.py$",
+  files = { "%.py$", "%.pyw$" },
   headers = "^#!.*[ /]python",
   comment = "#",
   patterns = {

data/plugins/trimwhitespace.lua

@@ -4,9 +4,16 @@ local Doc = require "core.doc"
 
 
 local function trim_trailing_whitespace(doc)
+  local cline, ccol = doc:get_selection()
   for i = 1, #doc.lines do
     local old_text = doc:get_text(i, 1, i, math.huge)
     local new_text = old_text:gsub("%s*$", "")
+
+    -- don't remove whitespace which would cause the caret to reposition
+    if cline == i and ccol > #new_text then
+      new_text = old_text:sub(1, ccol - 1)
+    end
+
     if old_text ~= new_text then
       doc:insert(i, 1, new_text)
       doc:remove(i, #new_text + 1, i, math.huge)

doc/usage.md

@@ -0,0 +1,146 @@
+# lite
+
+![screenshot](https://user-images.githubusercontent.com/3920290/81471642-6c165880-91ea-11ea-8cd1-fae7ae8f0bc4.png)
+
+## Overview
+lite is a lightweight text editor written mostly in Lua — it aims to provide
+something practical, pretty, *small* and fast, implemented as simply as
+possible; easy to modify and extend, or to use without doing either.
+
+
+## Getting Started
+When lite is started it's typically opened with a *project directory* — this
+is the directory where your project's code and other data resides. The project
+directory is set once when lite is started and, for the duration of the
+session, cannot be changed.
+
+To open lite with a specific project directory the directory name can be passed
+as a command-line argument *(`.` can be passed to use the current directory)* or
+the directory can be dragged onto either the lite executable or a running
+instance of lite.
+
+The main way of opening files in lite is through the `core:find-file` command
+— this provides a fuzzy finder over all of the project's files and can be
+opened using the **`ctrl+p`** shortcut by default.
+
+Commands can be run using keyboard shortcuts, or by using the `core:find-command`
+command bound to **`ctrl+shift+p`** by default. For example, pressing
+`ctrl+shift+p` and typing `newdoc` then pressing `return` would open a new
+document. The current keyboard shortcut for a command can be seen to the right
+of the command name on the command finder, thus to find the shortcut for a command
+`ctrl+shift+p` can be pressed and the command name typed.
+
+
+## User Module
+lite can be configured through use of the user module. The user module can be
+used for changing options in the config module, adding additional key bindings,
+loading custom color themes, modifying the style or changing any other part of
+lite to your personal preference.
+
+The user module is loaded by lite when the application starts, after the plugins
+have been loaded.
+
+The user module can be modified by running the `core:open-user-module` command
+or otherwise directly opening the `data/user/init.lua` file.
+
+
+## Project Module
+The project module is an optional module which is loaded from the current
+project's directory when lite is started. Project modules can be useful for
+things like adding custom commands for project-specific build systems, or
+loading project-specific plugins.
+
+The project module is loaded by lite when the application starts, after both the
+plugins and user module have been loaded.
+
+The project module can be edited by running the `core:open-project-module`
+command — if the module does not exist for the current project when the
+command is run it will be created.
+
+
+## Commands
+Commands in lite are used both through the command finder (`ctrl+shift+p`) and
+by lite's keyboard shortcut system. Commands consist of 3 components:
+* **Name** — The command name in the form of `namespace:action-name`, for
+  example: `doc:select-all`
+* **Predicate** — A function that returns true if the command can be ran, for
+  example, for any document commands the predicate checks whether the active
+  view is a document
+* **Function** — The function which performs the command itself
+
+Commands can be added using the `command.add` function provided by the
+`core.command` module:
+```lua
+local core = require "core"
+local command = require "core.command"
+
+command.add("core.docview", {
+  ["doc:save"] = function()
+    core.active_view.doc:save()
+    core.log("Saved '%s', core.active_view.doc.filename)
+  end
+})
+```
+
+Commands can be performed programatically (eg. from another command or by your
+user module) by calling the `command.perform` function after requiring the
+`command` module:
+```lua
+local command = require "core.command"
+command.perform "core:quit"
+```
+
+
+## Keymap
+All keyboard shortcuts in lite are handled by the `core.keymap` module. A key
+binding in lite maps a "stroke" (eg. `ctrl+q`) to one or more commands (eg.
+`core:quit`). When the shortcut is pressed lite will iterate each command
+assigned to that key and run the *predicate function* for that command — if the
+predicate passes it stops iterating and runs the command.
+
+An example of where this used is the default binding of the `tab` key:
+``` lua
+  ["tab"] = { "command:complete", "doc:indent" },
+```
+When tab is pressed the `command:complete` command is attempted which will only
+succeed if the command-input at the bottom of the window is active. Otherwise
+the `doc:indent` command is attempted which will only succeed if we have a
+document as our active view.
+
+A new mapping can be added by your user module as follows:
+```lua
+local keymap = require "core.keymap"
+keymap.add { ["ctrl+q"] = "core:quit" }
+```
+
+
+## Plugins
+Plugins in lite are normal lua modules and are treated as such — no
+complicated plugin manager is provided, and, once a plugin is loaded, it is never
+expected be to have to unload itself.
+
+To install a plugin simply drop it in the `data/plugins` directory — installed
+plugins will be automatically loaded when lite starts. To uninstall a plugin the
+plugin file can be deleted — any plugin (including those included with lite's
+default installation) can be deleted to remove its functionality.
+
+If you want to load a plugin only under a certain circumstance (for example,
+only on a given project) the plugin can be placed somewhere other than the
+`data/plugins` directory so that it is not automatically loaded. The plugin can
+then be loaded manually as needed by using the `require` function.
+
+Plugins can be downloaded from the [plugins repository](https://github.com/rxi/lite-plugins).
+
+
+## Color Themes
+Colors themes in lite are lua modules which overwrite the color fields of lite's
+`core.style` module. Color themes should be placed in the `data/user/colors`
+directory.
+
+A color theme can be set by requiring it in your user module:
+```lua
+require "user.colors.winter"
+```
+
+Color themes can be downloaded from the [color themes repository](https://github.com/rxi/lite-colors).
+

lite.cbp

@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<CodeBench_Project name="lite" path="SDH3:Programming&#047;workspace&#047;MyProjects&#047;lite&#047;lite.cbp" created="1387049720" lastmodified="1387152257">
+	<plugin name="PROGDIR:Plugins&#047;AmigaOS4SDK.CCPlugin" flags="0"/>
+	<target/>
+	<homedir name="SDH3:Programming&#047;workspace&#047;MyProjects&#047;lite"/>
+	<includedir name="Applications:Programming&#047;workspace&#047;OtherProjects&#047;lite&#047;src"/>
+	<compiler name="gcc:bin&#047;gcc" switches="-D__USE_INLINE__ -Wall -Werror -Wwrite-strings" stack="131072"/>
+	<linker switches="-lauto"/>
+	<debugger name="SDK:c&#047;gdb"/>
+	<builder name="SDK:c&#047;make -f"/>
+	<environment/>
+	<headers>
+		<file name="Applications:Programming&#047;workspace&#047;OtherProjects&#047;lite&#047;src&#047;api&#047;api.h" open="0"/>
+		<file name="Applications:Programming&#047;workspace&#047;OtherProjects&#047;lite&#047;src&#047;rencache.h" open="0"/>
+		<file name="Applications:Programming&#047;workspace&#047;OtherProjects&#047;lite&#047;src&#047;lib&#047;stb&#047;stb_truetype.h" open="0"/>
+		<file name="Applications:Programming&#047;workspace&#047;OtherProjects&#047;lite&#047;src&#047;renderer.h" open="0"/>
+	</headers>
+	<sources>
+		<file name="src&#047;api&#047;api.c" open="0"/>
+		<file name="src&#047;api&#047;renderer.c" open="0"/>
+		<file name="src&#047;api&#047;renderer_font.c" open="0"/>
+		<file name="src&#047;api&#047;system.c" open="0"/>
+		<file name="src&#047;main.c" open="1" current="1" top="75" left="0" line="97" row="16"/>
+		<file name="src&#047;rencache.c" open="0"/>
+		<file name="src&#047;renderer.c" open="0"/>
+		<file name="src&#047;lib&#047;stb&#047;stb_truetype.c" open="0"/>
+	</sources>
+	<flags value="0x0000000000078005"/>
+	<buildscript name="Makefile" depth="3" open="0"/>
+	<projectnotes open="0"/>
+	<buildwindow open="0"/>
+	<targets>
+		<target name="lite" linker="gcc:bin&#047;gcc" switches="-llua -lSDL2 -lpthread -lauto" flags="0x00000002">
+			<file name="src&#047;lib&#047;stb&#047;stb_truetype.c"/>
+			<file name="src&#047;api&#047;renderer.c"/>
+			<file name="src&#047;api&#047;renderer_font.c"/>
+			<file name="src&#047;api&#047;system.c"/>
+			<file name="src&#047;main.c"/>
+			<file name="src&#047;api&#047;api.c"/>
+			<file name="src&#047;rencache.c"/>
+			<file name="src&#047;renderer.c"/>
+		</target>
+	</targets>
+	<includepath>
+		<include path="src"/>
+	</includepath>
+	<logfile name="RAM Disk:Build.log"/>
+	<search lastsearch="stbtt_Scale" sensecase="1" replace_state="0"/>
+</CodeBench_Project>

src/lib/stb/stb_truetype.h

@@ -1,5 +1,14 @@
-// stb_truetype.h - v1.19 - public domain
-// authored from 2009-2016 by Sean Barrett / RAD Game Tools
+// stb_truetype.h - v1.24 - public domain
+// authored from 2009-2020 by Sean Barrett / RAD Game Tools
+//
+// =======================================================================
+//
+//    NO SECURITY GUARANTEE -- DO NOT USE THIS ON UNTRUSTED FONT FILES
+//
+// This library does no range checking of the offsets found in the file,
+// meaning an attacker can use it to read arbitrary memory.
+//
+// =======================================================================
 //
 //   This library processes TrueType files:
 //        parse files
@@ -32,11 +41,11 @@
 //       Daniel Ribeiro Maciel
 //
 //   Bug/warning reports/fixes:
-//       "Zer" on mollyrocket       Fabian "ryg" Giesen
-//       Cass Everitt               Martins Mozeiko
-//       stoiko (Haemimont Games)   Cap Petschulat
-//       Brian Hook                 Omar Cornut
-//       Walter van Niftrik         github:aloucks
+//       "Zer" on mollyrocket       Fabian "ryg" Giesen   github:NiLuJe
+//       Cass Everitt               Martins Mozeiko       github:aloucks
+//       stoiko (Haemimont Games)   Cap Petschulat        github:oyvindjam
+//       Brian Hook                 Omar Cornut           github:vassvik
+//       Walter van Niftrik         Ryan Griege
 //       David Gow                  Peter LaValle
 //       David Given                Sergey Popov
 //       Ivan-Assen Ivanov          Giumo X. Clanjor
@@ -44,11 +53,16 @@
 //       Johan Duparc               Thomas Fields
 //       Hou Qiming                 Derek Vinyard
 //       Rob Loach                  Cort Stratton
-//       Kenney Phillis Jr.         github:oyvindjam
-//       Brian Costabile            github:vassvik
+//       Kenney Phillis Jr.         Brian Costabile
+//       Ken Voskuil (kaesve)
 //
 // VERSION HISTORY
 //
+//   1.24 (2020-02-05) fix warning
+//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
+//   1.21 (2019-02-25) fix warning
+//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
 //   1.19 (2018-02-11) GPOS kerning, STBTT_fmod
 //   1.18 (2018-01-29) add missing function
 //   1.17 (2017-07-23) make more arguments const; doc fix
@@ -75,7 +89,7 @@
 //
 // USAGE
 //
-//   Include this file in whatever places neeed to refer to it. In ONE C/C++
+//   Include this file in whatever places need to refer to it. In ONE C/C++
 //   file, write:
 //      #define STB_TRUETYPE_IMPLEMENTATION
 //   before the #include of this file. This expands out the actual
@@ -242,19 +256,6 @@
 //   recommend it.
 //
 //
-// SOURCE STATISTICS (based on v0.6c, 2050 LOC)
-//
-//   Documentation & header file        520 LOC  \___ 660 LOC documentation
-//   Sample code                        140 LOC  /
-//   Truetype parsing                   620 LOC  ---- 620 LOC TrueType
-//   Software rasterization             240 LOC  \                           .
-//   Curve tesselation                  120 LOC   \__ 550 LOC Bitmap creation
-//   Bitmap management                  100 LOC   /
-//   Baked bitmap interface              70 LOC  /
-//   Font name matching & access        150 LOC  ---- 150 
-//   C runtime library abstraction       60 LOC  ----  60
-//
-//
 // PERFORMANCE MEASUREMENTS FOR 1.06:
 //
 //                      32-bit     64-bit
@@ -556,6 +557,8 @@ STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int p
 //
 // It's inefficient; you might want to c&p it and optimize it.
 
+STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap);
+// Query the font vertical metrics without having to create a font first.
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -641,6 +644,12 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h
 // To use with PackFontRangesGather etc., you must set it before calls
 // call to PackFontRangesGatherRects.
 
+STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip);
+// If skip != 0, this tells stb_truetype to skip any codepoints for which
+// there is no corresponding glyph. If skip=0, which is the default, then
+// codepoints without a glyph recived the font's "missing character" glyph,
+// typically an empty box by convention.
+
 STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph,  // same data as above
                                int char_index,             // character to display
                                float *xpos, float *ypos,   // pointers to current position in screen pixel space
@@ -669,6 +678,7 @@ struct stbtt_pack_context {
    int   height;
    int   stride_in_bytes;
    int   padding;
+   int   skip_missing;
    unsigned int   h_oversample, v_oversample;
    unsigned char *pixels;
    void  *nodes;
@@ -694,7 +704,7 @@ STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index);
 // file will only define one font and it always be at offset 0, so it will
 // return '0' for index 0, and -1 for all other indices.
 
-// The following structure is defined publically so you can declare one on
+// The following structure is defined publicly so you can declare one on
 // the stack or as a global or etc, but you should treat it as opaque.
 struct stbtt_fontinfo
 {
@@ -704,7 +714,7 @@ struct stbtt_fontinfo
 
    int numGlyphs;                     // number of glyphs, needed for range checking
 
-   int loca,head,glyf,hhea,hmtx,kern,gpos; // table locations as offset from start of .ttf
+   int loca,head,glyf,hhea,hmtx,kern,gpos,svg; // table locations as offset from start of .ttf
    int index_map;                     // a cmap mapping for our chosen character encoding
    int indexToLocFormat;              // format needed to map from glyph index to glyph
 
@@ -733,6 +743,7 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep
 // and you want a speed-up, call this function with the character you're
 // going to process, then use glyph-based functions instead of the
 // codepoint-based functions.
+// Returns 0 if the character codepoint is not defined in the font.
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -786,6 +797,18 @@ STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1,
 STBTT_DEF int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
 // as above, but takes one or more glyph indices for greater efficiency
 
+typedef struct stbtt_kerningentry
+{
+   int glyph1; // use stbtt_FindGlyphIndex
+   int glyph2;
+   int advance;
+} stbtt_kerningentry;
+
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info);
+STBTT_DEF int  stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length);
+// Retrieves a complete list of all of the kerning pairs provided by the font
+// stbtt_GetKerningTable never writes more than table_length entries and returns how many entries it did write.
+// The table will be sorted by (a.glyph1 == b.glyph1)?(a.glyph2 < b.glyph2):(a.glyph1 < b.glyph1)
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -820,7 +843,7 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s
 // returns # of vertices and fills *vertices with the pointer to them
 //   these are expressed in "unscaled" coordinates
 //
-// The shape is a series of countours. Each one starts with
+// The shape is a series of contours. Each one starts with
 // a STBTT_moveto, then consists of a series of mixed
 // STBTT_lineto and STBTT_curveto segments. A lineto
 // draws a line from previous endpoint to its x,y; a curveto
@@ -830,6 +853,11 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s
 STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
 // frees the data allocated above
 
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg);
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg);
+// fills svg with the character's SVG data.
+// returns data size or 0 if SVG not found.
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // BITMAP RENDERING
@@ -916,7 +944,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
 STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
 // These functions compute a discretized SDF field for a single character, suitable for storing
 // in a single-channel texture, sampling with bilinear filtering, and testing against
-// larger than some threshhold to produce scalable fonts.
+// larger than some threshold to produce scalable fonts.
 //        info              --  the font
 //        scale             --  controls the size of the resulting SDF bitmap, same as it would be creating a regular bitmap
 //        glyph/codepoint   --  the character to generate the SDF for
@@ -1331,6 +1359,22 @@ static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict)
    return stbtt__cff_get_index(&cff);
 }
 
+// since most people won't use this, find this table the first time it's needed
+static int stbtt__get_svg(stbtt_fontinfo *info)
+{
+   stbtt_uint32 t;
+   if (info->svg < 0) {
+      t = stbtt__find_table(info->data, info->fontstart, "SVG ");
+      if (t) {
+         stbtt_uint32 offset = ttULONG(info->data + t + 2);
+         info->svg = t + offset;
+      } else {
+         info->svg = 0;
+      }
+   }
+   return info->svg;
+}
+
 static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart)
 {
    stbtt_uint32 cmap, t;
@@ -1410,6 +1454,8 @@ static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, in
    else
       info->numGlyphs = 0xffff;
 
+   info->svg = -1;
+
    // find a cmap encoding table we understand *now* to avoid searching
    // later. (todo: could make this installable)
    // the same regardless of glyph.
@@ -1758,7 +1804,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          }
       }
       num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-   } else if (numberOfContours == -1) {
+   } else if (numberOfContours < 0) {
       // Compound shapes.
       int more = 1;
       stbtt_uint8 *comp = data + g + 10;
@@ -1835,9 +1881,6 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          // More components ?
          more = flags & (1<<5);
       }
-   } else if (numberOfContours < 0) {
-      // @TODO other compound variations?
-      STBTT_assert(0);
    } else {
       // numberOfCounters == 0, do nothing
    }
@@ -2266,6 +2309,48 @@ STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_inde
    }
 }
 
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   return ttUSHORT(data+10);
+}
+
+STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+   int k, length;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   length = ttUSHORT(data+10);
+   if (table_length < length)
+      length = table_length;
+
+   for (k = 0; k < length; k++)
+   {
+      table[k].glyph1 = ttUSHORT(data+18+(k*6));
+      table[k].glyph2 = ttUSHORT(data+20+(k*6));
+      table[k].advance = ttSHORT(data+22+(k*6));
+   }
+
+   return length;
+}
+
 static int  stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
 {
    stbtt_uint8 *data = info->data + info->kern;
@@ -2463,6 +2548,7 @@ static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i
                             if (valueFormat2 != 0) return 0;
 
                             STBTT_assert(coverageIndex < pairSetCount);
+                            STBTT__NOTUSED(pairSetCount);
 
                             needle=glyph2;
                             r=pairValueCount-1;
@@ -2540,8 +2626,7 @@ STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int
 
    if (info->gpos)
       xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
-
-   if (info->kern)
+   else if (info->kern)
       xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
 
    return xAdvance;
@@ -2602,6 +2687,45 @@ STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
    STBTT_free(v, info->userdata);
 }
 
+STBTT_DEF stbtt_uint8 *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl)
+{
+   int i;
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc_list = data + stbtt__get_svg((stbtt_fontinfo *) info);
+
+   int numEntries = ttUSHORT(svg_doc_list);
+   stbtt_uint8 *svg_docs = svg_doc_list + 2;
+
+   for(i=0; i<numEntries; i++) {
+      stbtt_uint8 *svg_doc = svg_docs + (12 * i);
+      if ((gl >= ttUSHORT(svg_doc)) && (gl <= ttUSHORT(svg_doc + 2)))
+         return svg_doc;
+   }
+   return 0;
+}
+
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg)
+{
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc;
+
+   if (info->svg == 0)
+      return 0;
+
+   svg_doc = stbtt_FindSVGDoc(info, gl);
+   if (svg_doc != NULL) {
+      *svg = (char *) data + info->svg + ttULONG(svg_doc + 4);
+      return ttULONG(svg_doc + 8);
+   } else {
+      return 0;
+   }
+}
+
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg)
+{
+   return stbtt_GetGlyphSVG(info, stbtt_FindGlyphIndex(info, unicode_codepoint), svg);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // antialiasing software rasterizer
@@ -3160,7 +3284,13 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
          if (e->y0 != e->y1) {
             stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
             if (z != NULL) {
-               STBTT_assert(z->ey >= scan_y_top);
+               if (j == 0 && off_y != 0) {
+                  if (z->ey < scan_y_top) {
+                     // this can happen due to subpixel positioning and some kind of fp rounding error i think
+                     z->ey = scan_y_top;
+                  }
+               }
+               STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds
                // insert at front
                z->next = active;
                active = z;
@@ -3229,7 +3359,7 @@ static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
 
 static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
 {
-   /* threshhold for transitioning to insertion sort */
+   /* threshold for transitioning to insertion sort */
    while (n > 12) {
       stbtt__edge t;
       int c01,c12,c,m,i,j;
@@ -3364,7 +3494,7 @@ static void stbtt__add_point(stbtt__point *points, int n, float x, float y)
    points[n].y = y;
 }
 
-// tesselate until threshhold p is happy... @TODO warped to compensate for non-linear stretching
+// tessellate until threshold p is happy... @TODO warped to compensate for non-linear stretching
 static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n)
 {
    // midpoint
@@ -3789,6 +3919,7 @@ STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, in
    spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw;
    spc->h_oversample = 1;
    spc->v_oversample = 1;
+   spc->skip_missing = 0;
 
    stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes);
 
@@ -3814,6 +3945,11 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h
       spc->v_oversample = v_oversample;
 }
 
+STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip)
+{
+   spc->skip_missing = skip;
+}
+
 #define STBTT__OVER_MASK  (STBTT_MAX_OVERSAMPLE-1)
 
 static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
@@ -3956,6 +4092,7 @@ static float stbtt__oversample_shift(int oversample)
 STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
    int i,j,k;
+   int missing_glyph_added = 0;
 
    k=0;
    for (i=0; i < num_ranges; ++i) {
@@ -3967,6 +4104,9 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb
          int x0,y0,x1,y1;
          int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
          int glyph = stbtt_FindGlyphIndex(info, codepoint);
+         if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) {
+            rects[k].w = rects[k].h = 0;
+         } else {
             stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
                                             scale * spc->h_oversample,
                                             scale * spc->v_oversample,
@@ -3974,6 +4114,9 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb
                                             &x0,&y0,&x1,&y1);
             rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
             rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
+            if (glyph == 0)
+               missing_glyph_added = 1;
+         }
          ++k;
       }
    }
@@ -4007,7 +4150,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info
 // rects array must be big enough to accommodate all characters in the given ranges
 STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
-   int i,j,k, return_value = 1;
+   int i,j,k, missing_glyph = -1, return_value = 1;
 
    // save current values
    int old_h_over = spc->h_oversample;
@@ -4026,7 +4169,7 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const
       sub_y = stbtt__oversample_shift(spc->v_oversample);
       for (j=0; j < ranges[i].num_chars; ++j) {
          stbrp_rect *r = &rects[k];
-         if (r->was_packed) {
+         if (r->was_packed && r->w != 0 && r->h != 0) {
             stbtt_packedchar *bc = &ranges[i].chardata_for_range[j];
             int advance, lsb, x0,y0,x1,y1;
             int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
@@ -4072,6 +4215,13 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const
             bc->yoff     =       (float)  y0 * recip_v + sub_y;
             bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
             bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
+
+            if (glyph == 0)
+               missing_glyph = j;
+         } else if (spc->skip_missing) {
+            return_value = 0;
+         } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) {
+            ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph];
          } else {
             return_value = 0; // if any fail, report failure
          }
@@ -4140,6 +4290,19 @@ STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *
    return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1);
 }
 
+STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap)
+{
+   int i_ascent, i_descent, i_lineGap;
+   float scale;
+   stbtt_fontinfo info;
+   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata, index));
+   scale = size > 0 ? stbtt_ScaleForPixelHeight(&info, size) : stbtt_ScaleForMappingEmToPixels(&info, -size);
+   stbtt_GetFontVMetrics(&info, &i_ascent, &i_descent, &i_lineGap);
+   *ascent  = (float) i_ascent  * scale;
+   *descent = (float) i_descent * scale;
+   *lineGap = (float) i_lineGap * scale;
+}
+
 STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer)
 {
    float ipw = 1.0f / pw, iph = 1.0f / ph;
@@ -4360,12 +4523,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
    int w,h;
    unsigned char *data;
 
-   // if one scale is 0, use same scale for both
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) return NULL;  // if both scales are 0, return NULL
-      scale_y = scale_x;
-   }
+   if (scale == 0) return NULL;
 
    stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
 

src/main.c

@@ -38,6 +38,9 @@ static void get_exe_filename(char *buf, int sz) {
 #elif __APPLE__
   unsigned size = sz;
   _NSGetExecutablePath(buf, &size);
+#elif __amigaos4__
+  // TODO: Temporary. Needs to be done properly
+  strcpy(buf, "Applications:Programming/workspace/MyProjects/lite/lite");
 #else
   strcpy(buf, "./lite");
 #endif
@@ -102,7 +105,7 @@ int main(int argc, char **argv) {
   }
   lua_setglobal(L, "ARGS");
 
-  lua_pushstring(L, "1.08");
+  lua_pushstring(L, "1.11");
   lua_setglobal(L, "VERSION");
 
   lua_pushstring(L, SDL_GetPlatform());

src/rencache.c

@@ -18,6 +18,7 @@ typedef struct {
   RenRect rect;
   RenColor color;
   RenFont *font;
+  int tab_width;
   char text[0];
 } Command;
 
@@ -143,6 +144,7 @@ int rencache_draw_text(RenFont *font, const char *text, int x, int y, RenColor c
       cmd->color = color;
       cmd->font = font;
       cmd->rect = rect;
+      cmd->tab_width = ren_get_font_tab_width(font);
     }
   }
 
@@ -254,6 +256,7 @@ void rencache_end_frame(void) {
           ren_draw_rect(cmd->rect, cmd->color);
           break;
         case DRAW_TEXT:
+          ren_set_font_tab_width(cmd->font, cmd->tab_width);
           ren_draw_text(cmd->font, cmd->text, cmd->rect.x, cmd->rect.y, cmd->color);
           break;
       }

src/renderer.c

@@ -222,6 +222,12 @@ void ren_set_font_tab_width(RenFont *font, int n) {
 }
 
 
+int ren_get_font_tab_width(RenFont *font) {
+  GlyphSet *set = get_glyphset(font, '\t');
+  return set->glyphs['\t'].xadvance;
+}
+
+
 int ren_get_font_width(RenFont *font, const char *text) {
   int x = 0;
   const char *p = text;
@@ -278,17 +284,22 @@ void ren_draw_rect(RenRect rect, RenColor color) {
   int y2 = rect.y + rect.height;
   x2 = x2 > clip.right  ? clip.right  : x2;
   y2 = y2 > clip.bottom ? clip.bottom : y2;
-
+printf("DBG: rect\tx1: %d\ty1: %d\tx2:%d\ty2:%d\n", x1, y1, x2, y2);
   SDL_Surface *surf = SDL_GetWindowSurface(window);
   RenColor *d = (RenColor*) surf->pixels;
-  d += x1 + y1 * surf->w;
-  int dr = surf->w - (x2 - x1);
-
+printf("DBG: surf\tr: %d\tg: %d\tb:%d\ta:%d\tw: %d\n", d->r, d->g, d->b, d->a, surf->w);
+  d += x1 + y1 * (surf->pitch / 4);
+//printf("DBG: surf\tr: %d\tg: %d\tb:%d\ta:%d\n", d->r, d->g, d->b, d->a);
+  int dr = (surf->pitch / 4) - (x2 - x1);
+printf("DBG: r: %d\tg: %d\tb:%d\ta:%d\n", color.r, color.g, color.b, color.a);
   if (color.a == 0xff) {
-    rect_draw_loop(color);
+	//rect_draw_loop(color);
+	SDL_Rect rect = { x1, y1, x2 - x1, y2 - y1 };
+	SDL_FillRect(surf, &rect, SDL_MapRGBA(surf->format, color.r, color.g, color.b, color.a));
   } else {
 	rect_draw_loop(blend_pixel(*d, color));
   }
+printf("======================\n");
 }
 
 

src/renderer.h

@@ -22,6 +22,7 @@ void ren_free_image(RenImage *image);
 RenFont* ren_load_font(const char *filename, float size);
 void ren_free_font(RenFont *font);
 void ren_set_font_tab_width(RenFont *font, int n);
+int ren_get_font_tab_width(RenFont *font);
 int ren_get_font_width(RenFont *font, const char *text);
 int ren_get_font_height(RenFont *font);