From f6e2761e6e9941c14a50f4222a6382fe14b35645 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 21 May 2013 20:50:30 +0200
Subject: sync luatex-fonts files (merged)

---
 luaotfload-basics-gen.lua |  6 +++---
 luaotfload-basics-nod.lua | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/luaotfload-basics-gen.lua b/luaotfload-basics-gen.lua
index 0561778..4a46fbb 100644
--- a/luaotfload-basics-gen.lua
+++ b/luaotfload-basics-gen.lua
@@ -147,18 +147,18 @@ do
 
     -- standard context tree setup
 
-    local cachepaths = kpse.expand_path('$TEXMFCACHE') or ""
+    local cachepaths = kpse.expand_var('$TEXMFCACHE') or ""
 
     -- quite like tex live or so
 
     if cachepaths == "" then
-        cachepaths = kpse.expand_path('$TEXMFVAR')
+        cachepaths = kpse.expand_var('$TEXMFVAR') or ""
     end
 
     -- this also happened to be used
 
     if cachepaths == "" then
-        cachepaths = kpse.expand_path('$VARTEXMF')
+        cachepaths = kpse.expand_var('$VARTEXMF') or ""
     end
 
     -- and this is a last resort
diff --git a/luaotfload-basics-nod.lua b/luaotfload-basics-nod.lua
index 151d98a..5ab9df7 100644
--- a/luaotfload-basics-nod.lua
+++ b/luaotfload-basics-nod.lua
@@ -28,12 +28,12 @@ if tex.attribute[0] ~= 0 then
 
 end
 
-attributes            = { }
+attributes            = attributes or { }
 attributes.unsetvalue = -0x7FFFFFFF
 
 local numbers, last = { }, 127
 
-function attributes.private(name)
+attributes.private = attributes.private or function(name)
     local number = numbers[name]
     if not number then
         if last < 255 then
@@ -63,6 +63,9 @@ nodes.glyphcodes   = glyphcodes
 local free_node    = node.free
 local remove_node  = node.remove
 local new_node     = node.new
+local traverse_id  = node.traverse_id
+
+local math_code    = nodecodes.math
 
 nodes.handlers.protectglyphs   = node.protect_glyphs
 nodes.handlers.unprotectglyphs = node.unprotect_glyphs
@@ -93,3 +96,9 @@ function nodes.pool.kern(k)
     n.kern = k
     return n
 end
+
+function nodes.endofmath(n)
+    for n in traverse_id(math_code,n.next) do
+        return n
+    end
+end
-- 
cgit v1.2.3