diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/frenchb.lua')
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index cbc79319e72..f759ef2e499 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua @@ -1,5 +1,5 @@ -- --- File `frenchb.lua' generated from frenchb.dtx [2016/04/18 v3.2b] +-- File `frenchb.lua' generated from frenchb.dtx [2016/05/14 v3.2c] -- -- Copyright © 2014-2016 Daniel Flipo -- <daniel (dot) flipo (at) free (dot) fr> @@ -81,6 +81,7 @@ local function new_glue_scaled (fid,width,stretch,shrink) return nil end end +local FBspacing = luatexbase.attributes['FB@spacing'] local addDPspace = luatexbase.attributes['FB@addDPspace'] local addGUILspace = luatexbase.attributes['FB@addGUILspace'] local has_attribute = node.has_attribute @@ -89,8 +90,12 @@ local function french_punctuation (head) local lang = item.lang local char = item.char local fid = item.font + local FRspacing = has_attribute(item, FBspacing) + FRspacing = FRspacing and FRspacing > 0 local SIG = has_attribute(item, addGUILspace) - if lang == FR and FB_punct_left[char] and fid > 0 then + SIG = SIG and SIG >0 + if lang == FR and FRspacing and + FB_punct_left[char] and fid > 0 then local prev = item.prev local prev_id, prev_subtype, prev_char if prev then @@ -130,7 +135,7 @@ local function french_punctuation (head) insert_node_before(head, item, copy_node(nobreak)) insert_node_before(head, item, copy_node(fbglue)) end - elseif SIG and SIG > 0 then + elseif SIG then local addgl = (prev_char and not FB_guil_null[prev_char]) or (not prev_char and prev_id ~= TEMP and @@ -149,8 +154,8 @@ local function french_punctuation (head) end end end - if lang == FR and FB_punct_right[char] and fid > 0 - and SIG and SIG > 0 then + if lang == FR and FRspacing and FB_punct_right[char] + and fid > 0 and SIG then local next = item.next local next_id, next_subtype, next_char, nextnext, kern_wd if next then |