From 2b86b3c259cdb4df4fda41889ecad9d3f366c973 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 May 2013 16:40:24 +0300 Subject: beta 2013.05.09 15:23 --- tex/context/base/type-set.mkiv | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'tex/context/base/type-set.mkiv') diff --git a/tex/context/base/type-set.mkiv b/tex/context/base/type-set.mkiv index 99c38bc5d..bfbf7af9e 100644 --- a/tex/context/base/type-set.mkiv +++ b/tex/context/base/type-set.mkiv @@ -15,18 +15,30 @@ \ifnum\typescriptstate=\plustwo - % store - - \loadmarkfile{type-def} - \loadmarkfile{type-lua} - \loadmarkfile{type-siz} - \loadmarkfile{type-fbk} - - % \loadtypescriptfile[def] % meant for local usage only - % \loadtypescriptfile[lua] % meant for local usage only - % \loadtypescriptfile[siz] % meant for local usage only - \loadmarkfile{type-imp-latinmodern} - % \usetypescriptfile[latinmodern] + % we store some typescripts in the format + + % \loadmarkfile{type-def} + % \loadmarkfile{type-lua} + % \loadmarkfile{type-siz} + % \loadmarkfile{type-fbk} + % \loadmarkfile{type-imp-latinmodern} + + % but ... let's make sure that newlines are gone + + \loadfoundtypescriptfile{type-def.mkiv} + \loadfoundtypescriptfile{type-lua.mkiv} + \loadfoundtypescriptfile{type-siz.mkiv} + \loadfoundtypescriptfile{type-fbk.mkiv} + \loadfoundtypescriptfile{type-imp-latinmodern.mkiv} + + % and not: + + % \loadtypescriptfile[def] % meant for local usage only + % \loadtypescriptfile[fbk] % meant for local usage only + % \loadtypescriptfile[lua] % meant for local usage only + % \loadtypescriptfile[siz] % meant for local usage only + % \usetypescriptfile[latinmodern] + \usetypescriptfile[loc] % We want these names preset but they conflict with later loads so from now on @@ -40,7 +52,7 @@ \usetypescriptfile[fbk] \usetypescriptfile[lua] \usetypescriptfile[siz] - \usetypescriptfile[otf] + \usetypescriptfile[latinmodern] \usetypescriptfile[loc] \fi -- cgit v1.2.3