From 25ec075c2eb5bd0b5dece77e35164a0077ef96ab Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 19 Dec 2013 00:11:00 +0100 Subject: beta 2013.12.19 00:11 --- tex/generic/context/luatex/luatex-basics.tex | 2 ++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- tex/generic/context/luatex/luatex-fonts.tex | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tex/generic') diff --git a/tex/generic/context/luatex/luatex-basics.tex b/tex/generic/context/luatex/luatex-basics.tex index bb34587ff..abe498970 100644 --- a/tex/generic/context/luatex/luatex-basics.tex +++ b/tex/generic/context/luatex/luatex-basics.tex @@ -12,6 +12,8 @@ %D rather dumb attribute allocator. We start at 256 because we don't want %D any interference with the attributes used in the font handler. +\ifx\newattribute\undefined \else \endinput \fi + \newcount \lastallocatedattribute \lastallocatedattribute=255 \def\newattribute#1% diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 468168c0c..321bb7700 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 12/14/13 13:43:12 +-- merge date : 12/19/13 00:11:25 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/luatex/luatex-fonts.tex b/tex/generic/context/luatex/luatex-fonts.tex index a7c8bc2b8..7b457e9b4 100644 --- a/tex/generic/context/luatex/luatex-fonts.tex +++ b/tex/generic/context/luatex/luatex-fonts.tex @@ -132,7 +132,9 @@ %D and the \CONTEXT\ wiki. \directlua { - dofile(kpse.find_file("luatex-fonts.lua","tex")) + if not fonts then + dofile(kpse.find_file("luatex-fonts.lua","tex")) + end } \endinput -- cgit v1.2.3