diff options
| author | Marius <mariausol@gmail.com> | 2011-10-08 13:00:15 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-10-08 13:00:15 +0300 |
| commit | d67c88b277ff5d781397fb99ef9470f51b8eeced (patch) | |
| tree | 0591fb2ba80eecacf76d57ea3d13e1e37ad6f5ef /tex/generic | |
| parent | a85039d1355c0a8957ba591f6a0ef204f127e459 (diff) | |
| download | context-d67c88b277ff5d781397fb99ef9470f51b8eeced.tar.gz | |
beta 2011.10.08 11:42
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 11 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-test.tex | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0a596ab7e..7156e0a00 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 : 10/08/11 10:33:58 +-- merge date : 10/08/11 11:42:24 do -- begin closure to overcome local limits and interference @@ -10196,6 +10196,11 @@ local function featuresprocessor(head,font,attr) local dirstack = { } -- could move outside function + -- We could work on sub start-stop ranges instead but I wonder if there is that + -- much speed gain (experiments showed that it made not much sense) and we need + -- to keep track of directions anyway. Also at some point I want to play with + -- font interactions and then we do need the full sweeps. + for s=1,#sequences do local dataset = datasets[s] if dataset then @@ -10289,7 +10294,7 @@ local function featuresprocessor(head,font,attr) else start = start.next end - elseif id == whatsit_code then + elseif id == whatsit_code then -- will be function local subtype = start.subtype if subtype == dir_code then local dir = start.dir @@ -10335,7 +10340,7 @@ local function featuresprocessor(head,font,attr) local id = start.id if id == glyph_code then if start.subtype<256 and start.font == font then - local a has_attribute(start,0) + local a = has_attribute(start,0) if a then a = (a == attr) and (not attribute or has_attribute(start,state,attribute)) else diff --git a/tex/generic/context/luatex/luatex-test.tex b/tex/generic/context/luatex/luatex-test.tex index 830d30a91..3020b5594 100644 --- a/tex/generic/context/luatex/luatex-test.tex +++ b/tex/generic/context/luatex/luatex-test.tex @@ -12,6 +12,8 @@ \pdfoutput=1 +% \directlua{generic_context.caches.compilemethod = "both" } % none luac dump both + \font\testa=file:lmroman10-regular at 12pt \testa \input tufte \par \font\testb=file:lmroman12-regular:+liga; at 24pt \testb effe flink fietsen \par \font\testc=file:lmroman12-regular:mode=node;+liga; at 24pt \testc effe flink fietsen \par |