From a5998cb3add3331d4e44024bae4ec3c18777ca4f Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 31 Dec 2014 18:06:47 +0100 Subject: [fontloader] sync with Context as of 2014-12-31 --- src/fontloader/misc/fontloader-l-file.lua | 4 ++-- src/fontloader/runtime/fontloader-fontloader.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fontloader/misc/fontloader-l-file.lua b/src/fontloader/misc/fontloader-l-file.lua index 2c471d7..7ed6370 100644 --- a/src/fontloader/misc/fontloader-l-file.lua +++ b/src/fontloader/misc/fontloader-l-file.lua @@ -157,8 +157,8 @@ file.suffix = suffixonly file.suffixesonly = suffixesonly file.suffixes = suffixesonly -file.dirname = pathpart -- obsolete -file.extname = suffixonly -- obsolete +file.dirname = pathpart -- obsolete +file.extname = suffixonly -- obsolete -- actually these are schemes diff --git a/src/fontloader/runtime/fontloader-fontloader.lua b/src/fontloader/runtime/fontloader-fontloader.lua index 83f1376..6500989 100644 --- a/src/fontloader/runtime/fontloader-fontloader.lua +++ b/src/fontloader/runtime/fontloader-fontloader.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 12/29/14 10:01:59 +-- merge date : 12/31/14 16:52:11 do -- begin closure to overcome local limits and interference -- cgit v1.2.3