From 7b7f140fd9e06487b7eca4efe37b13c54df5bb29 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Wed, 11 May 2011 10:18:00 +0200
Subject: beta 2011.05.11 10:18
---
tex/context/base/char-cjk.lua | 2 ++
tex/context/base/char-ini.lua | 22 +++++++++++-----------
tex/context/base/lpdf-wid.lua | 2 +-
tex/context/base/sort-ini.lua | 2 +-
tex/context/base/status-files.pdf | Bin 23537 -> 23541 bytes
tex/context/base/status-lua.pdf | Bin 154323 -> 154319 bytes
tex/context/fonts/xits-math.lfg | 9 ++++++++-
7 files changed, 23 insertions(+), 14 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/char-cjk.lua b/tex/context/base/char-cjk.lua
index bc5fbafe2..5dc20ff74 100644
--- a/tex/context/base/char-cjk.lua
+++ b/tex/context/base/char-cjk.lua
@@ -232,6 +232,8 @@ local hangul_syllable_metatable = {
if k == "fscode" then
-- no need to cache this as we normally use fscodes
return leadconsonant(u)
+ elseif k == "shcode" then
+ return { decomposed(u) }
elseif k == "specials" then
return { "char", decomposed(u) }
elseif k == "description" then
diff --git a/tex/context/base/char-ini.lua b/tex/context/base/char-ini.lua
index c85bb3f49..059332d51 100644
--- a/tex/context/base/char-ini.lua
+++ b/tex/context/base/char-ini.lua
@@ -698,32 +698,32 @@ end
utf.string = utf.string or utfstring
-characters.categories = allocate() local categories = characters.categories -- lazy table
+local categories = allocate() characters.categories = categories -- lazy table
setmetatableindex(categories, function(t,u) if u then local c = data[u] c = c and c.category or u t[u] = c return c end end)
-characters.lccodes = allocate() local lccodes = characters.lccodes -- lazy table
-characters.uccodes = allocate() local uccodes = characters.uccodes -- lazy table
-characters.shcodes = allocate() local shcodes = characters.shcodes -- lazy table
-characters.fscodes = allocate() local fscodes = characters.fscodes -- lazy table
+local lccodes = allocate() characters.lccodes = lccodes -- lazy table
+local uccodes = allocate() characters.uccodes = uccodes -- lazy table
+local shcodes = allocate() characters.shcodes = shcodes -- lazy table
+local fscodes = allocate() characters.fscodes = fscodes -- lazy table
setmetatableindex(lccodes, function(t,u) if u then local c = data[u] c = c and c.lccode or (type(u) == "string" and utfbyte(u)) or u t[u] = c return c end end)
setmetatableindex(uccodes, function(t,u) if u then local c = data[u] c = c and c.uccode or (type(u) == "string" and utfbyte(u)) or u t[u] = c return c end end)
setmetatableindex(shcodes, function(t,u) if u then local c = data[u] c = c and c.shcode or (type(u) == "string" and utfbyte(u)) or u t[u] = c return c end end)
setmetatableindex(fscodes, function(t,u) if u then local c = data[u] c = c and c.fscode or (type(u) == "string" and utfbyte(u)) or u t[u] = c return c end end)
-characters.lcchars = allocate() local lcchars = characters.lcchars -- lazy table
-characters.ucchars = allocate() local ucchars = characters.ucchars -- lazy table
-characters.shchars = allocate() local shchars = characters.shchars -- lazy table
-characters.fschars = allocate() local fschars = characters.fschars -- lazy table
+local lcchars = allocate() characters.lcchars = lcchars -- lazy table
+local ucchars = allocate() characters.ucchars = ucchars -- lazy table
+local shchars = allocate() characters.shchars = shchars -- lazy table
+local fschars = allocate() characters.fschars = fschars -- lazy table
setmetatableindex(lcchars, function(t,u) if u then local c = data[u] c = c and c.lccode c = c and utfstring(c) or (type(u) == "number" and utfchar(u)) or u t[u] = c return c end end)
setmetatableindex(ucchars, function(t,u) if u then local c = data[u] c = c and c.uccode c = c and utfstring(c) or (type(u) == "number" and utfchar(u)) or u t[u] = c return c end end)
setmetatableindex(shchars, function(t,u) if u then local c = data[u] c = c and c.shcode c = c and utfstring(c) or (type(u) == "number" and utfchar(u)) or u t[u] = c return c end end)
setmetatableindex(fschars, function(t,u) if u then local c = data[u] c = c and c.fscode c = c and utfstring(c) or (type(u) == "number" and utfchar(u)) or u t[u] = c return c end end)
-characters.specialchars = allocate() local specialchars = characters.specialchars -- lazy table
-characters.descriptions = allocate() local descriptions = characters.descriptions -- lazy table
+local specialchars = allocate() characters.specialchars = specialchars -- lazy table
+local descriptions = allocate() characters.descriptions = descriptions -- lazy table
setmetatableindex(specialchars, function(t,u)
if u then
diff --git a/tex/context/base/lpdf-wid.lua b/tex/context/base/lpdf-wid.lua
index 5e4247003..d0247f49a 100644
--- a/tex/context/base/lpdf-wid.lua
+++ b/tex/context/base/lpdf-wid.lua
@@ -184,7 +184,7 @@ local function flushembeddedfiles()
for tag, reference in next, filestreams do
if not reference then
report_attachment("unreferenced file: tag '%s'",tag)
- elseif referenced[name] == "hidden" then
+ elseif referenced[tag] == "hidden" then
e[#e+1] = pdfstring(tag)
e[#e+1] = reference -- already a reference
else
diff --git a/tex/context/base/sort-ini.lua b/tex/context/base/sort-ini.lua
index 4462ddb9c..12b5b49e0 100644
--- a/tex/context/base/sort-ini.lua
+++ b/tex/context/base/sort-ini.lua
@@ -223,7 +223,7 @@ local function preparetables(data)
end
end
end
- else
+ else -- we probably never enter this branch
-- fschars returns a single char
s = fschars[k]
if s and s ~= k then
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 944fbabf4..196f218e7 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 0b6881929..229ab2c5f 100644
Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ
diff --git a/tex/context/fonts/xits-math.lfg b/tex/context/fonts/xits-math.lfg
index 4151e18a0..a97a7599d 100644
--- a/tex/context/fonts/xits-math.lfg
+++ b/tex/context/fonts/xits-math.lfg
@@ -12,7 +12,14 @@ return {
copyright = "ConTeXt development team",
mathematics = {
alternates = {
- cal = { feature = 'ss01', value = 1, comment = "alternative calligraphic shapes" },
+ cal = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" },
+ greekssup = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" },
+ greekssit = { feature = 'ss03', value = 1, comment = "Mathematical Italic Sans Serif Digits" },
+ monobfnum = { feature = 'ss04', value = 1, comment = "Mathematical Bold Monospace Digits" },
+ mathbbbf = { feature = 'ss05', value = 1, comment = "Mathematical Bold Double-Struck Alphabet" },
+ mathbbit = { feature = 'ss06', value = 1, comment = "Mathematical Italic Double-Struck Alphabet" },
+ mathbbbi = { feature = 'ss07', value = 1, comment = "Mathematical Bold Italic Double-Struck Alphabet" },
+ upint = { feature = 'ss08', value = 1, comment = "Upright Integrals" },
}
}
}
--
cgit v1.2.3