diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/scrp-cjk.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/scrp-cjk.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/context/base/scrp-cjk.lua b/Master/texmf-dist/tex/context/base/scrp-cjk.lua index a452673fa9f..997baaa962b 100644 --- a/Master/texmf-dist/tex/context/base/scrp-cjk.lua +++ b/Master/texmf-dist/tex/context/base/scrp-cjk.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['scrp-cjk'] = { version = 1.001, - comment = "companion to scrp-ini.tex", + comment = "companion to scrp-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -26,7 +26,9 @@ local kind_to_number = scripts.kind_to_number local number_to_kind = scripts.number_to_kind local hash = scripts.hash local cjk = scripts.cjk -local fontdata = fonts.ids + +local fontdata = fonts.identifiers +local quaddata = fonts.quads -- raggedleft is controlled by leftskip and we might end up with a situation where -- the intercharacter spacing interferes with this; the solution is to patch the @@ -38,8 +40,7 @@ local inter_char_hangul_penalty = 0 local function set_parameters(font,data) -- beware: parameters can be nil in e.g. punk variants - local parameters = fontdata[font].parameters - local quad = (parameters and parameters.quad or parameters[6]) or 0 + local quad = quaddata[font] inter_char_half_shrink = data.inter_char_half_shrink_factor * quad inter_char_stretch = data.inter_char_stretch_factor * quad inter_char_hangul_penalty = data.inter_char_hangul_penalty @@ -486,7 +487,7 @@ local injectors = { -- [previous] [current] full_width_close = { jami_initial = nobreak_shrink_break_stretch, korean = nobreak_shrink_break_stretch, - chinese = nobreak_shrink_break_stretch, + chinese = stretch_break, -- nobreak_shrink_break_stretch, half_width_open = nobreak_shrink_break_stretch_nobreak_autoshrink, half_width_close = nobreak_shrink_nobreak_stretch, full_width_open = nobreak_shrink_break_stretch_nobreak_shrink, @@ -498,7 +499,7 @@ local injectors = { -- [previous] [current] half_width_close = { jami_initial = nobreak_shrink_break_stretch, korean = nobreak_autoshrink_break_stretch, - chinese = nobreak_autoshrink_break_stretch, + chinese = stretch_break, -- nobreak_autoshrink_break_stretch, half_width_open = nobreak_autoshrink_break_stretch_nobreak_autoshrink, half_width_close = nobreak_autoshrink_nobreak_stretch, full_width_open = nobreak_autoshrink_break_stretch_nobreak_shrink, |