babel-french (1jan16)

git-svn-id: svn://tug.org/texlive/trunk@39253 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 24 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 496da883135..0c708b3ccc9 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,11 +33,11 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesLanguage{frenchb}
-         [2015/11/25 v3.1j French support from the babel system]
+         [2016/01/01 v3.1k French support from the babel system]
 %%
 %%  File `frenchb.ldf'
 %%  Babel package for LaTeX version 2e
-%%  Copyright (C) 1996 - 2015
+%%  Copyright © 1996 - 2016
 %%            by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
 %%
 \chardef\atcatcode=\catcode`\@
@@ -300,7 +300,13 @@
      \XeTeXinterchartoks \FB@guilf \FB@punctthick = {%
                      \FDP@colonspace}%
      \XeTeXinterchartoks 255 \FB@punctthick = {%
-                     \ifhmode\unskip\penalty\@M\FBcolonspace\fi}%
+                     \ifhmode
+                       \ifdim\lastskip>1sp
+                         \unskip\penalty\@M\FBcolonspace
+                       \else
+                         \FDP@colonspace
+                       \fi
+                     \fi}%
      \bbl@for\FB@char
              {`\;,`\!,`\?}%
              {\XeTeXcharclass\FB@char=\FB@punctthin}%
@@ -309,7 +315,13 @@
      \XeTeXinterchartoks \FB@guilf \FB@punctthin = {%
                      \FDP@thinspace}%
      \XeTeXinterchartoks 255 \FB@punctthin = {%
-                     \ifhmode\unskip\penalty\@M\FBthinspace\fi}%
+                     \ifhmode
+                       \ifdim\lastskip>1sp
+                         \unskip\penalty\@M\FBthinspace
+                       \else
+                         \FDP@thinspace
+                       \fi
+                     \fi}%
      \XeTeXinterchartoks \FB@guilo \z@ = {%
                 \ifFBAutoSpaceGuill\FBguillspace\fi}%
      \XeTeXinterchartoks \FB@guilo 255 = {%
@@ -363,16 +375,16 @@
   \initiate@active@char{?}%
   \declare@shorthand{french}{;}{%
       \ifhmode
-      \ifdim\lastskip>\z@
+        \ifdim\lastskip>1sp
           \unskip\penalty\@M\FBthinspace
-          \else
-            \FDP@thinspace
+        \else
+          \FDP@thinspace
         \fi
       \fi
       \string;}
   \declare@shorthand{french}{!}{%
       \ifhmode
-        \ifdim\lastskip>\z@
+        \ifdim\lastskip>1sp
           \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
@@ -381,7 +393,7 @@
       \string!}
   \declare@shorthand{french}{?}{%
       \ifhmode
-        \ifdim\lastskip>\z@
+        \ifdim\lastskip>1sp
           \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
@@ -390,7 +402,7 @@
       \string?}
   \declare@shorthand{french}{:}{%
       \ifhmode
-        \ifdim\lastskip>\z@
+        \ifdim\lastskip>1sp
           \unskip\penalty\@M\FBcolonspace
         \else
           \FDP@colonspace
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 9640acbfc68..12021d10ed4 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,7 +1,7 @@
 --
---  File `frenchb.lua' generated from frenchb.dtx [2015/11/25 v3.1j]
+--  File `frenchb.lua' generated from frenchb.dtx [2016/01/01 v3.1k]
 --
---  Copyright (C) 2014-2015 Daniel Flipo
+--  Copyright © 2014-2016 Daniel Flipo
 --  <daniel (dot) flipo (at) free (dot) fr>
 --  License LPPL: see frenchb.ldf.
 --