From a5e79f5a13a16a69d5423de5ba2032d4afaca5d6 Mon Sep 17 00:00:00 2001
From: Elie Roux <elie.roux@telecom-bretagne.eu>
Date: Fri, 3 May 2013 14:25:37 +0200
Subject: Updating Makefile a bit

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bdc2d35..2d165c5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 NAME         = luaotfload
 DOC          = $(NAME).pdf
 DTX          = $(NAME).dtx
-OTFL         = $(wildcard otfl-*.lua) otfl-blacklist.cnf font-age.lua
+OTFL         = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf
 SCRIPT       = luaotfload-tool.lua
 
 GLYPHSCRIPT  = mkglyphlist
-- 
cgit v1.2.3


From 95e6817d9a37722f0a0fd089ee31a6d75535fb08 Mon Sep 17 00:00:00 2001
From: Elie Roux <elie.roux@telecom-bretagne.eu>
Date: Fri, 3 May 2013 14:25:51 +0200
Subject: A little tuning (some simplifications)

---
 luaotfload-auxiliary.lua | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/luaotfload-auxiliary.lua b/luaotfload-auxiliary.lua
index 2cf1e00..844c170 100644
--- a/luaotfload-auxiliary.lua
+++ b/luaotfload-auxiliary.lua
@@ -155,25 +155,6 @@ end
 
 aux.font_has_glyph = font_has_glyph
 
---- int -> bool
-local current_font_has_glyph = function (codepoint)
-  return font_has_glyph (font.current(), codepoint)
-end
-
-aux.current_font_has_glyph = current_font_has_glyph
-
-local do_if_glyph_else = function (chr, positive, negative)
-  local codepoint = tonumber(chr)
-  if not codepoint then codepoint = utf8.byte(chr) end
-  if current_font_has_glyph(codepoint) then
-    tex.sprint(positive)
-  else
-    tex.sprint(negative)
-  end
-end
-
-aux.do_if_glyph_else = do_if_glyph_else
-
 --[[doc--
 
   This one is approximately “name_to_slot” from the microtype package;
@@ -184,9 +165,9 @@ aux.do_if_glyph_else = do_if_glyph_else
 
 --doc]]--
 
---- string -> (int | false)
-local slot_of_name = function (glyphname)
-  local fontdata = identifiers[font.current()]
+--- int -> string -> (int | false)
+local slot_of_name = function (font_id, glyphname)
+  local fontdata = identifiers[font_id]
   if fontdata then
     local unicode = fontdata.resources.unicodes[glyphname]
     if unicode and type(unicode) == "number" then
-- 
cgit v1.2.3


From 778267979a304bd83228fd0077c453a953d35fd0 Mon Sep 17 00:00:00 2001
From: Elie Roux <elie.roux@telecom-bretagne.eu>
Date: Fri, 3 May 2013 14:28:03 +0200
Subject: Updating test

Very interesting feature by the way
---
 tests/pln-aux-1.tex | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/pln-aux-1.tex b/tests/pln-aux-1.tex
index a504850..a228be0 100644
--- a/tests/pln-aux-1.tex
+++ b/tests/pln-aux-1.tex
@@ -12,7 +12,13 @@
 %% wrap tests in macros (could move to style file)
 \def\doifglyphelse#1#2#3{%
   \directlua{
-    luaotfload.aux.do_if_glyph_else([[#1]], [[#2]], [[#3]])
+    local codepoint = tonumber('\string#1')
+    if not codepoint then codepoint = unicode.utf8.byte('\string#1') end
+    if luaotfload.aux.font_has_glyph(font.current(), codepoint) then
+      tex.sprint('\string#2')
+    else
+      tex.sprint('\string#3')
+    end
   }%
 }
 
-- 
cgit v1.2.3