ltximg (12apr18)

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

8 files changed, 111 insertions, 103 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index 9c01f4193f0..3d62600cc15 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index fe64cd9f8da..3b4c68305ee 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{3600}
+%\CheckSum{3611}
 %
 %\iffalse
 %    Tell the LaTeX system who we are and write an entry on the
@@ -13,7 +13,7 @@
 %<frenchb>\ProvidesLanguage{frenchb}
 %<lua>--[[
 %<lua>   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]
 %<*internal>
 \iffalse
 %</internal>
@@ -4383,23 +4383,11 @@ return french_punctuation
 %    available on the keyboard (through a compose key for instance)
 %    is more comfortable than typing |\og| and |\fg|.
 %
-%    With pdfTeX (or old LuaTeX and XeTeX engines), quote characters
-%    are made active and expand to |\og\ignorespaces| and |{\fg}|
-%    respectively if the current language is French, and to
-%    |\guillemotleft| and |\guillemotright| otherwise (think of German
-%    quotes), this is done by |\FB@@og| and |\FB@@fg|; thus correct
-%    non-breaking spaces will be added automatically to French quotes.
-%    The quote characters typed in depend on the input encoding,
-%    it can be single-byte (latin1, latin9, applemac,\dots) or
-%    multi-bytes (utf-8, utf8x); the \pkg{inputenc} package has to
-%    be loaded before the |\begin{document}| with the proper coding
-%    option, so we check if |\DeclareInputText| is defined.
-%
-%    Life is much simpler here with modern LuaTeX or XeTeX engines: we
-%    just have to activate the |\FB@addGUILspace| attribute for LuaTeX
-%    or set |\XeTeXcharclass| of quotes to the proper value for XeTeX.
+%    Life is simple here with modern LuaTeX or XeTeX engines: we just
+%    have to activate the |\FB@addGUILspace| attribute for LuaTeX or
+%    set |\XeTeXcharclass| of quotes to the proper value for XeTeX.
 %
-% \changes{v2.4c}{2010/05/23}{In \cs{ttfamilyFB}, also cancel
+%\changes{v2.4c}{2010/05/23}{In \cs{ttfamilyFB}, also cancel
 %    automatic spaces inside French guillemets coded as characters
 %    (see \cs{frenchbsetup}).}
 %
@@ -4418,6 +4406,23 @@ return french_punctuation
 % \changes{v3.2c}{2016/05/03}{Add a warning about options og/fg for old
 %    XeTeX or LuaTeX engines requiring active characters.}
 %
+% \changes{v3.4d}{2018/04/11}{New test for deciding about utf8 encoding
+%    for keys og and fg (the former one fails with LaTeX 2018 release).}
+%
+%    With pdfTeX (or old LuaTeX and XeTeX engines), quote characters
+%    are made active and expand to |\og\ignorespaces| and |{\fg}|
+%    respectively if the current language is French, and to
+%    |\guillemotleft| and |\guillemotright| otherwise (think of German
+%    quotes), this is done by |\FB@@og| and |\FB@@fg|; thus correct
+%    non-breaking spaces will be added automatically to French quotes.
+%    The quote characters typed in depend on the input encoding,
+%    it can be single-byte (latin1, latin9, applemac,\dots) or
+%    multi-bytes (utf-8, utf8x); the next command checks if a character
+%    is single-byte (then |\FB@second| is empty) or not.
+%    \begin{macrocode}
+  \def\FB@parse#1#2\endparse{\def\FB@second{#2}}%
+%    \end{macrocode}
+%
 %    \begin{macrocode}
   \define@key{FB}{og}%
           {\ifFBunicode
@@ -4461,43 +4466,45 @@ return french_punctuation
                   \fi
                 \else\guillemotleft\fi}%
              \AtBeginDocument{%
-                \ifdefined\DeclareInputText
-                  \ifdefined\uc@dclc
+                \ifdefined\uc@dclc
 %    \end{macrocode}
-%    Package \pkg{inputenc} with utf8x encoding loaded, use |\uc@dclc|,
+%    Package \pkg{inputenc} with utf8x (ucs) encoding loaded,
+%    use |\uc@dclc|:
 %    \begin{macrocode}
-                    \uc@dclc{171}{default}{\FB@@og}%
-                  \else
+                  \uc@dclc{171}{default}{\FB@@og}%
+                \else
 %    \end{macrocode}
-%    if encoding is not utf8x, try utf8\dots
+%    if encoding is not utf8x, check if the argument of |og|
+%    is a single-byte character:
 %    \begin{macrocode}
-                    \ifdefined\DeclareUnicodeCharacter
+                  \FB@parse#1\endparse
+                  \ifx\FB@second\@empty
 %    \end{macrocode}
-%    utf8 loaded, use |\DeclareUnicodeCharacter|,
+%    This means 8-bit character encoding.
+%    Package \pkg{MULEenc} (from CJK) defines |\mule@def|
+%    to map characters to control sequences.
 %    \begin{macrocode}
-                      \DeclareUnicodeCharacter{00AB}{\FB@@og}%
+                    \ifdefined\mule@def
+                      \mule@def{11}{\FB@@og}%
                     \else
+                      \ifdefined\DeclareInputText
+                        \@tempcnta`#1\relax
+                        \DeclareInputText{\the\@tempcnta}{\FB@@og}%
+                      \else
 %    \end{macrocode}
-%    if utf8 is not loaded either, we assume 8-bit character input
-%    encoding.  Package \pkg{MULEenc} (from CJK) defines |\mule@def|
-%    to map characters to control sequences.
+%    Package \pkg{inputenc} not loaded, no way\dots{}
 %    \begin{macrocode}
-                      \@tempcnta`#1\relax
-                      \ifdefined\mule@def
-                        \mule@def{11}{\FB@@og}%
-                      \else
-                        \DeclareInputText{\the\@tempcnta}{\FB@@og}%
+                        \FBWarning{Option `og' requires package
+                                   inputenc;\MessageBreak reported}%
                       \fi
                     \fi
-                  \fi
-                \else
+                  \else
 %    \end{macrocode}
-%    Package \pkg{inputenc} not loaded, no way\dots{}
+%    This means multi-byte character encoding, we assume UTF-8
 %    \begin{macrocode}
-                  \FBWarning{Option `og' requires package inputenc;%
-                             \MessageBreak reported}%
-                \fi
-              }%
+                    \DeclareUnicodeCharacter{00AB}{\FB@@og}%
+                  \fi
+                \fi}%
            \fi
           }%
 %    \end{macrocode}
@@ -4527,26 +4534,26 @@ return french_punctuation
                   \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/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.