diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-19 22:13:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-19 22:13:31 +0000 |
commit | 04e521880f42c9699c6b045c32176f3f59bd11c8 (patch) | |
tree | 94736c5a01a1800cb18047b756ee8bcd3fb05e1d /Master/texmf-dist/tex/generic/babel-french/frenchb.lua | |
parent | ff3c0e83bcf8933daf4eebaf87613022ca946b6a (diff) |
babel-french (19mar16)
git-svn-id: svn://tug.org/texlive/trunk@40078 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/frenchb.lua')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index 9464f25a581..508bf77ec5a 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/02/13 v3.1l] +-- File `frenchb.lua' generated from frenchb.dtx [2016/03/18 v3.2a] -- -- Copyright © 2014-2016 Daniel Flipo -- <daniel (dot) flipo (at) free (dot) fr> @@ -75,9 +75,11 @@ local function new_glue_scaled (fid,width,stretch,shrink) gl_spec.width = width * fp.space gl_spec.stretch = stretch * fp.space_stretch gl_spec.shrink = shrink * fp.space_shrink + gl.spec = gl_spec + return gl + else + return nil end - gl.spec = gl_spec - return gl else return nil end @@ -125,7 +127,7 @@ local function french_punctuation (head) else fbglue = new_glue_scaled(fid,thinwd,thinst,thinsh) end - if realglue or auto then + if (realglue or auto) and fbglue then if realglue then head = remove_node(head,prev,true) end @@ -141,11 +143,11 @@ local function french_punctuation (head) if glue and glue_wd <= 1 then addgl = false end - if addgl then + local fbglue = new_glue_scaled(fid,guilwd,guilst,guilsh) + if addgl and fbglue then if glue then head = remove_node(head,prev,true) end - local fbglue = new_glue_scaled(fid,guilwd,guilst,guilsh) insert_node_before(head, item, copy_node(nobreak)) insert_node_before(head, item, copy_node(fbglue)) end @@ -185,12 +187,12 @@ local function french_punctuation (head) if glue and glue_wd == 0 then addgl = false end - if addgl then + local fid = item.font + local fbglue = new_glue_scaled(fid,guilwd,guilst,guilsh) + if addgl and fbglue then if glue then head = remove_node(head,next,true) end - local fid = item.font - local fbglue = new_glue_scaled(fid,guilwd,guilst,guilsh) insert_node_after(head, item, copy_node(fbglue)) insert_node_after(head, item, copy_node(nobreak)) end |