diff options
| author | Hans Hagen <pragma@wxs.nl> | 2009-07-23 20:11:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2009-07-23 20:11:00 +0200 |
| commit | 3edfc2fc3e569201a16c63871aae121e57673539 (patch) | |
| tree | 77c2fab43ff04bc1dd3d89a577e855a66c38d7e8 /tex/generic | |
| parent | b32da8747292384893ea07a0a5659b24eb216c10 (diff) | |
| download | context-3edfc2fc3e569201a16c63871aae121e57673539.tar.gz | |
stable 2009.07.23 20:11
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 7 | ||||
| -rw-r--r-- | tex/generic/context/luatex-fonts.lua | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index e369b6746..03eeed936 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua --- merge date : 07/17/09 13:18:01 +-- merge date : 07/23/09 20:13:36 do -- begin closure to overcome local limits and interference @@ -2924,11 +2924,6 @@ if not modules then modules = { } end modules ['node-dum'] = { nodes = nodes or { } -function nodes.simple_font_dummy(head,tail) - -- ligaturing, kerning - return head, tail -end - function nodes.simple_font_handler(head) -- lang.hyphenate(head) head = nodes.process_characters(head) diff --git a/tex/generic/context/luatex-fonts.lua b/tex/generic/context/luatex-fonts.lua index 690a6e599..56768138b 100644 --- a/tex/generic/context/luatex-fonts.lua +++ b/tex/generic/context/luatex-fonts.lua @@ -37,7 +37,7 @@ local function loadmodule(name,continue) end else if verbose then - texio.write(string.format(" <%s>",string.match(name,"([a-z%-]-%.[a-z]-)$"))) -- no file.basename yet + texio.write(string.format(" <%s>",foundname)) -- no file.basename yet end dofile(foundname) end @@ -128,8 +128,8 @@ end -- In order to deal with the fonts we need to initialize some -- callbacks. One can overload them later on if needed. -callback.register('ligaturing', nodes.simple_font_dummy) -- better: false -callback.register('kerning', nodes.simple_font_dummy) -- better: false +callback.register('ligaturing', false) +callback.register('kerning', false) callback.register('pre_linebreak_filter', nodes.simple_font_handler) callback.register('hpack_filter', nodes.simple_font_handler) callback.register('define_font' , fonts.define.read) |