babel (4oct17)

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

1 files changed, 42 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 4d016da281d..6db9b31282e 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -5,15 +5,16 @@
 %% The original source files were:
 %%
 %% babel.dtx  (with options: `core')
-%% This is a generated file.
-%% 
-%% Copyright 2012-2016 Javier Bezos and Johannes L. Braams.
-%% Copyright 1989-2008 Johannes L. Braams and any individual authors
-%% listed elsewhere in this file.  All rights reserved.
-%% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
 %% 
+%%
+%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 1989-2012 Johannes L. Braams and
+%%           any individual authors listed elsewhere in this file.
+%% All rights reserved.
+%%
+%% This file is part of the Babel system.
+%% --------------------------------------
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
@@ -21,32 +22,15 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2003/12/01 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status "maintained".
-%% 
+%%
 %% The Current Maintainer of this work is Javier Bezos.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
-%% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
+%%
 %% The list of derived (unpacked) files belonging to the distribution
 %% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/09/18 v3.13 The Babel package]
-%% Babel package for LaTeX2e.
-%% Copyright (C) 1989-2008 by Johannes Braams,
-%%                            TeXniek
-%%                            all rights reserved.
-%% Copyright (C) 2013-2017 by Johannes Braams
-%%                            TeXniek
-%%                         by Javier Bezos
-%%                            all rights reserved.
+%% extension |.ins|) which are part of the distribution.
+%%
 \ifx\ldf@quit\@undefined
 \else
   \expandafter\endinput
@@ -56,7 +40,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2017/09/18 3.13 Babel common definitions]
+\ProvidesFile{babel.def}[2017/10/04 3.14 Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -77,13 +61,13 @@
     \else
       \closein1
       \begingroup
-\def\addlanguage#1#2#3#4#5{%
-  \expandafter\ifx\csname lang@#1\endcsname\relax\else
-    \global\expandafter\let\csname l@#1\expandafter\endcsname
-      \csname lang@#1\endcsname
-  \fi}%
-\def\uselanguage#1{}%
-\input language.def
+        \def\addlanguage#1#2#3#4#5{%
+          \expandafter\ifx\csname lang@#1\endcsname\relax\else
+            \global\expandafter\let\csname l@#1\expandafter\endcsname
+              \csname lang@#1\endcsname
+          \fi}%
+        \def\uselanguage#1{}%
+        \input language.def
       \endgroup
     \fi
   \fi
@@ -1285,14 +1269,14 @@
     {\bbl@ifblank{#1}%
       {\bbl@error
         {If you want to modify `#2' you must tell how in\\%
-         the optional argument. Currently there are two\\%
-         options: captions=lang-tag, hyphenrules=lang-list}%
+         the optional argument. Currently there are three\\%
+         options: captions=lang-tag, hyphenrules=lang-list\\%
+         import=lang-tag}%
         {Use this macro as documented}}%
       {\bbl@provide@renew{#2}}}%
   \bbl@exp{\\\babelensure[exclude=\\\today]{#2}}%
   \let\languagename\bbl@savelangname}
 \def\bbl@provide@new#1{%
-  \bbl@provide@hyphens{#1}%
   \@namedef{date#1}{}% marks lang exists - required by \StartBabelCommands
   \@namedef{extras#1}{}%
   \@namedef{noextras#1}{}%
@@ -1324,11 +1308,11 @@
     \def\<#1hyphenmins>{%
       {\bbl@ifunset{bbl@lfthm@#1}{2}{\@nameuse{bbl@lfthm@#1}}}%
       {\bbl@ifunset{bbl@rgthm@#1}{3}{\@nameuse{bbl@rgthm@#1}}}}}%
+  \bbl@provide@hyphens{#1}%
   \ifx\bbl@KVP@main\@nil\else
      \expandafter\main@language\expandafter{#1}%
   \fi}
 \def\bbl@provide@renew#1{%
-  \bbl@provide@hyphens{#1}%
   \ifx\bbl@KVP@captions\@nil\else
     \StartBabelCommands*{#1}{captions}%
       \bbl@read@ini{\bbl@KVP@captions}%   Here all letters cat = 11
@@ -1341,7 +1325,8 @@
      \bbl@savetoday
      \bbl@savedate
    \EndBabelCommands
-  \fi}
+  \fi
+  \bbl@provide@hyphens{#1}}
 \def\bbl@provide@hyphens#1{%
   \let\bbl@tempa\relax
   \ifx\bbl@KVP@hyphenrules\@nil\else
@@ -1356,7 +1341,13 @@
            {\bbl@exp{\let\bbl@tempa\<l@##1>}}%
       \fi}%
   \fi
-  \ifx\bbl@tempa\relax %        if no option or no language found
+  \ifx\bbl@tempa\relax %        if no opt or no language in opt found
+    \ifx\bbl@KVP@import\@nil\else % if importing
+      \bbl@exp{%                and hyphenrules is not empty
+        \\\bbl@ifblank{\@nameuse{bbl@hyphr@#1}}%
+          {}%
+          {\\\adddialect\<l@#1>\<l@\@nameuse{bbl@hyphr@\languagename}>}}%
+    \fi
     \bbl@ifunset{l@#1}%         no hyphenrules found - fallback
       {\bbl@exp{\\\adddialect\<l@#1>\language}}%
       {}%
@@ -1422,6 +1413,7 @@
 \def\bbl@after@ini{%
   \bbl@exportkey{lfthm}{typography.lefthyphenmin}{2}%
   \bbl@exportkey{rgthm}{typography.righthyphenmin}{3}%
+  \bbl@exportkey{hyphr}{typography.hyphenrules}{}%
   \def\bbl@tempa{0.9}%
   \bbl@csarg\ifx{@kv@identification.version}\bbl@tempa
     \bbl@warning{%
@@ -1738,16 +1730,18 @@
 \else
   \DeclareTextFontCommand{\textlatin}{\latintext}
 \fi
-\def\bbl@trtscripts{%
-  ,Arabic,Imperial Aramaic,Avestan,Cypriot,Hatran,Hebrew,%
+\def\bbl@alscripts{,Arabic,Syriac,Thaana,}
+\def\bbl@rscripts{%
+  ,Imperial Aramaic,Avestan,Cypriot,Hatran,Hebrew,%
   Old Hungarian,Old Hungarian,Lydian,Mandaean,Manichaean,%
   Manichaean,Meroitic Cursive,Meroitic,Old North Arabian,%
   Nabataean,N'Ko,Orkhon,Palmyrene,Inscriptional Pahlavi,%
   Psalter Pahlavi,Phoenician,Inscriptional Parthian,Samaritan,%
-  Old South Arabian,Syriac,Thaana,}%
+  Old South Arabian,}%
 \def\bbl@ensuredir{%
   \@expandtwoargs
-  \in@{\csname bbl@script@\languagename\endcsname}{\bbl@trtscripts}%
+  \in@{\csname bbl@script@\languagename\endcsname}%
+      {\bbl@alscripts\bbl@rscripts}%
   \ifin@
     \bbl@setdirs\@ne
   \else