diff options
| -rw-r--r-- | context/data/scite/lexers/scite-context-lexer-tex.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4152 -> 4149 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105960 -> 105868 bytes | |||
| -rw-r--r-- | tex/context/base/font-otn.lua | 18 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24592 -> 24591 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 195299 -> 195300 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 20 |
7 files changed, 22 insertions, 18 deletions
diff --git a/context/data/scite/lexers/scite-context-lexer-tex.lua b/context/data/scite/lexers/scite-context-lexer-tex.lua index 2e982365a..f59624051 100644 --- a/context/data/scite/lexers/scite-context-lexer-tex.lua +++ b/context/data/scite/lexers/scite-context-lexer-tex.lua @@ -390,7 +390,7 @@ local stoplua = P("\\stop") * Cmt(luaenvironment,stopdisplaylua) local startluacode = token("embedded", startlua) local stopluacode = #stoplua * token("embedded", stoplua) -local metafuncall = ( P("reusable") + P("usable") + P("unique") + P("use") ) * ("MPgraphic") +local metafuncall = ( P("reusable") + P("usable") + P("unique") + P("use") + P("reuse") ) * ("MPgraphic") + P("uniqueMPpagegraphic") local metafunenvironment = metafuncall -- ( P("use") + P("reusable") + P("unique") ) * ("MPgraphic") diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 837960a4b..f170d90ea 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 6c3ff5231..3f0623a33 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua index 51b6e03a4..6ea35f139 100644 --- a/tex/context/base/font-otn.lua +++ b/tex/context/base/font-otn.lua @@ -387,16 +387,18 @@ end -- iteration this becomes a KAF-LAM-ALEF with a SHADDA on the second and a FATHA on the -- third component. -local function getcomponentindex(start) -- so we cannot remove components ! - local i = 0 - if start.subtype == ligature_code then - local comp = start.components - while comp do - i = i + getcomponentindex(comp) - comp = comp.next +local function getcomponentindex(start) + if start.id ~= glyph_code then + return 0 + elseif start.subtype == ligature_code then + local i = 0 + local components = start.components + while components do + i = i + getcomponentindex(components) + components = components.next end return i - elseif not marks[start.char] then + elseif not marks[start.char] then return 1 else return 0 diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex fa2ac8f1b..4b9d11360 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex fefabbcc8..56417a2f8 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 37b52d9fc..c2719a495 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/06/12 14:55:25 +-- merge date : 10/06/12 15:31:31 do -- begin closure to overcome local limits and interference @@ -9206,16 +9206,18 @@ end -- iteration this becomes a KAF-LAM-ALEF with a SHADDA on the second and a FATHA on the -- third component. -local function getcomponentindex(start) -- so we cannot remove components ! - local i = 0 - if start.subtype == ligature_code then - local comp = start.components - while comp do - i = i + getcomponentindex(comp) - comp = comp.next +local function getcomponentindex(start) + if start.id ~= glyph_code then + return 0 + elseif start.subtype == ligature_code then + local i = 0 + local components = start.components + while components do + i = i + getcomponentindex(components) + components = components.next end return i - elseif not marks[start.char] then + elseif not marks[start.char] then return 1 else return 0 |
