summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-12-31 18:06:47 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-12-31 18:06:47 +0100
commita5998cb3add3331d4e44024bae4ec3c18777ca4f (patch)
tree0b634a1b4266a72044e4259b86137ca348ea1844 /src
parent08e3b858401b56d97ff101295a3236fc8e0d47ef (diff)
downloadluaotfload-a5998cb3add3331d4e44024bae4ec3c18777ca4f.tar.gz
[fontloader] sync with Context as of 2014-12-31
Diffstat (limited to 'src')
-rw-r--r--src/fontloader/misc/fontloader-l-file.lua4
-rw-r--r--src/fontloader/runtime/fontloader-fontloader.lua2
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