ltximg (12apr18)

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

6 files changed, 42 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 935402251f9..4caf29f3db7 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{acadian}
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
 \PackageInfo{acadian.ldf}%
   {`acadian' dialect is currently\MessageBreak
    *absolutely identical* to the\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 46944194bc6..7c1ff2175b1 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{canadien}
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
 \PackageWarning{canadien.ldf}%
   {Option `canadien' for Babel is *deprecated*,\MessageBreak
    it might be removed sooner or later.  Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 97f36d7a9dd..a7613fa1588 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{francais}
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
 \PackageWarning{francais.ldf}%
   {Option `francais' for Babel is *deprecated*,\MessageBreak
    it might be removed sooner or later.  Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 4e6d9fb4105..16aafb2ee61 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{french}
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
 %%
 %%  Babel package for LaTeX version 2e
 %%  Copyright © 1996-2018
@@ -1306,6 +1306,7 @@
                         LuaTeX *only*.\MessageBreak Reported}%
            \fi
           }%
+  \def\FB@parse#1#2\endparse{\def\FB@second{#2}}%
   \define@key{FB}{og}%
           {\ifFBunicode
              \ifFB@luatex@punct
@@ -1329,26 +1330,26 @@
                   \fi
                 \else\guillemotleft\fi}%
              \AtBeginDocument{%
-                \ifdefined\DeclareInputText
-                  \ifdefined\uc@dclc
-                    \uc@dclc{171}{default}{\FB@@og}%
-                  \else
-                    \ifdefined\DeclareUnicodeCharacter
-                      \DeclareUnicodeCharacter{00AB}{\FB@@og}%
+                \ifdefined\uc@dclc
+                  \uc@dclc{171}{default}{\FB@@og}%
+                \else
+                  \FB@parse#1\endparse
+                  \ifx\FB@second\@empty
+                    \ifdefined\mule@def
+                      \mule@def{11}{\FB@@og}%
                     \else
-                      \@tempcnta`#1\relax
-                      \ifdefined\mule@def
-                        \mule@def{11}{\FB@@og}%
-                      \else
+                      \ifdefined\DeclareInputText
+                        \@tempcnta`#1\relax
                         \DeclareInputText{\the\@tempcnta}{\FB@@og}%
+                      \else
+                        \FBWarning{Option `og' requires package
+                                   inputenc;\MessageBreak reported}%
                       \fi
                     \fi
+                  \else
+                    \DeclareUnicodeCharacter{00AB}{\FB@@og}%
                   \fi
-                \else
-                  \FBWarning{Option `og' requires package inputenc;%
-                             \MessageBreak reported}%
-                \fi
-              }%
+                \fi}%
            \fi
           }%
   \define@key{FB}{fg}%
@@ -1374,26 +1375,26 @@
                   \fi
                 \else\guillemotright\fi}%
              \AtBeginDocument{%
-               \ifdefined\DeclareInputText
-                 \ifdefined\uc@dclc
-                   \uc@dclc{187}{default}{\FB@@fg}%
-                 \else
-                   \ifdefined\DeclareUnicodeCharacter
-                     \DeclareUnicodeCharacter{00BB}{\FB@@fg}%
-                   \else
-                     \@tempcnta`#1\relax
-                     \ifdefined\mule@def
-                       \mule@def{27}{{\FB@@fg}}%
-                     \else
-                       \DeclareInputText{\the\@tempcnta}{\FB@@fg}%
-                     \fi
-                   \fi
-                 \fi
-               \else
-                 \FBWarning{Option `fg' requires package inputenc;%
-                            \MessageBreak reported}%
-               \fi
-              }%
+                \ifdefined\uc@dclc
+                  \uc@dclc{187}{default}{\FB@@fg}%
+                \else
+                  \FB@parse#1\endparse
+                  \ifx\FB@second\@empty
+                    \ifdefined\mule@def
+                      \mule@def{27}{{\FB@@fg}}%
+                    \else
+                      \ifdefined\DeclareInputText
+                        \@tempcnta`#1\relax
+                        \DeclareInputText{\the\@tempcnta}{\FB@@fg}%
+                      \else
+                        \FBWarning{Option `fg' requires package
+                                   inputenc;\MessageBreak reported}%
+                      \fi
+                    \fi
+                  \else
+                    \DeclareUnicodeCharacter{00BB}{\FB@@fg}%
+                  \fi
+                \fi}%
            \fi
           }%
 }
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 3e359f24e6d..e8c36d4e847 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{frenchb}
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
 \def\bbl@tempa{frenchb}
 \ifx\CurrentOption\bbl@tempa
   \let\l@frenchb\l@french
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index a528db4723e..bf492065382 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,6 +1,6 @@
 --[[
    File `frenchb.lua’ generated from frenchb.dtx
-         [2018/03/25 v3.4c French support from the babel system]
+         [2018/04/12 v3.4d French support from the babel system]
    Copyright © 2014-2018 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.