summaryrefslogtreecommitdiff
path: root/tex/context/base/spac-chr.lua
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-01-24 12:40:18 +0200
committerMarius <mariausol@gmail.com>2012-01-24 12:40:18 +0200
commit61f9cff70fd57ae1be9208820b4d31bd7152c785 (patch)
tree393a2d0c960552d2bd29c1c1bdbc0a749d177bb3 /tex/context/base/spac-chr.lua
parent6371f988d54dd0bec1c613110df77e5be103591f (diff)
downloadcontext-61f9cff70fd57ae1be9208820b4d31bd7152c785.tar.gz
beta 2012.01.24 11:11
Diffstat (limited to 'tex/context/base/spac-chr.lua')
-rw-r--r--tex/context/base/spac-chr.lua15
1 files changed, 9 insertions, 6 deletions
diff --git a/tex/context/base/spac-chr.lua b/tex/context/base/spac-chr.lua
index b8a428aaf..00c3d6766 100644
--- a/tex/context/base/spac-chr.lua
+++ b/tex/context/base/spac-chr.lua
@@ -46,8 +46,10 @@ local typesetters = typesetters
local characters = { }
typesetters.characters = characters
-local fontparameters = fonts.hashes.parameters
-local fontcharacters = fonts.hashes.characters
+local fonthashes = fonts.hashes
+local fontparameters = fonthashes.parameters
+local fontcharacters = fonthashes.characters
+local fontquads = fonthashes.quads
local a_character = attributes.private("characters")
local a_alignstate = attributes.private("alignstate")
@@ -58,7 +60,7 @@ local c_period = byte('.')
local function inject_quad_space(unicode,head,current,fraction)
local attr = current.attr
if fraction ~= 0 then
- fraction = fraction * fontparameters[current.font].quad
+ fraction = fraction * fontquads[current.font]
end
local glue = new_glue(fraction)
-- glue.attr = copy_node_list(attr)
@@ -71,8 +73,9 @@ end
local function inject_char_space(unicode,head,current,parent)
local attr = current.attr
- local char = fontcharacters[current.font][parent]
- local glue = new_glue(char and char.width or fontparameters[current.font].space)
+ local font = current.font
+ local char = fontcharacters[font][parent]
+ local glue = new_glue(char and char.width or fontparameters[font].space)
-- glue.attr = copy_node_list(current.attr)
glue.attr = current.attr
current.attr = nil
@@ -160,7 +163,7 @@ local methods = {
end,
[0x202F] = function(head,current) -- narrownobreakspace
- return inject_nobreak_space(0x202F,head,current,fontparameters[current.font].space/8)
+ return inject_nobreak_space(0x202F,head,current,fontquads[current.font]/8)
end,
[0x205F] = function(head,current) -- math thinspace