summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-21 22:17:31 +0000
committerKarl Berry <karl@freefriends.org>2014-04-21 22:17:31 +0000
commit55b6d1e036cbf4eb905dd1438723d091232649cf (patch)
tree6d2fe9b1ec97b2e62e0bacd941f9b908004580b0 /Master/texmf-dist/tex/generic/babel-french/frenchb.lua
parentb9cdcfa7770322ac6a61dfb79bc747704cb9170c (diff)
babel-french (21apr14)
git-svn-id: svn://tug.org/texlive/trunk@33601 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.lua18
1 files changed, 15 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 7d0ffb50de4..253cbdfaac7 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 [2014/03/14 v3.0b]
+-- File `frenchb.lua' generated from frenchb.dtx [2014/04/18 v3.0c]
--
-- Copyright (C) 2014 Daniel Flipo <daniel.flipo at free.fr>
-- License LPPL: see frenchb.dtx.
@@ -87,6 +87,12 @@ local function french_punctuation (head)
end
end
local glue = prev_id == GLUE and prev_subtype == 0
+ local glue_wd
+ if glue then
+ glue_spec = prev.spec
+ glue_wd = glue_spec.width
+ end
+ glue = glue and glue_wd > 0
if FB_punct_thin[char] or FB_punct_thick[char] then
local SBDP = has_attribute(item, addDPspace)
local fbglue
@@ -97,8 +103,9 @@ local function french_punctuation (head)
end
local auto =
SBDP and SBDP > 0 and
- (prev_char and not FB_punct_null[prev_char]) or
- (not prev_char and (prev_id ~= 0 or prev_subtype ~= 3))
+ ((prev_char and not FB_punct_null[prev_char]) or
+ (not prev_char and (prev_id ~= 0 or prev_subtype ~= 3))
+ )
if glue or auto then
if glue then
head = remove_node(head,prev,true)
@@ -128,6 +135,11 @@ local function french_punctuation (head)
end
end
local glue = next_id == GLUE and next_subtype == 0
+ if glue then
+ glue_spec = next.spec
+ glue_wd = glue_spec.width
+ end
+ glue = glue and glue_wd > 0
if glue or (next_char and not FB_guil_null[next_char]) then
if glue then
head = remove_node(head,next,true)