From 52652942c9ae20b76c5d722386d43252e1137db4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 May 2013 22:27:06 +0000 Subject: babel (16may13) git-svn-id: svn://tug.org/texlive/trunk@30506 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/babel/babel.def | 6 +++--- Master/texmf-dist/tex/generic/babel/babel.sty | 6 +++--- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 12 +++++++++--- Master/texmf-dist/tex/generic/babel/nil.ldf | 4 ++-- Master/texmf-dist/tex/generic/babel/switch.def | 8 ++++---- 5 files changed, 21 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 840bebbc8a9..be6f32123e6 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -38,7 +38,7 @@ %% 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}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -58,12 +58,12 @@ } \fi \ProvidesFile{babel.def} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi -\def\bbl@tempa{3.9e} +\def\bbl@tempa{3.9f} \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 1fd791be7f7..f479ee0eef4 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -39,7 +39,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[2005/12/01] %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -49,11 +49,11 @@ %% by Javier Bezos %% all rights reserved. \ProvidesPackage{babel} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % The Babel package] \@ifpackagewith{babel}{debug} {\let\bbl@tempa\relax} - {\def\bbl@tempa{3.9e}}% + {\def\bbl@tempa{3.9f}}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index b2aa4446012..d8cb2b5a720 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -38,7 +38,7 @@ %% 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}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -55,7 +55,7 @@ } \fi \ProvidesFile{hyphen.cfg} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % Babel language switching mechanism] \ifx\AtBeginDocument\@undefined \let\orig@dump\dump @@ -78,7 +78,7 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\toks8{Babel <3.9e> and hyphenation patterns for }% +\toks8{Babel <3.9f> and hyphenation patterns for }% \def\process@line#1#2 #3 #4 {% \ifx=#1% \process@synonym{#2}% @@ -122,6 +122,12 @@ \edef\bbl@languages{% \bbl@languages\bbl@elt{#1}{\the\language}{#2}{\bbl@tempa}}% \ifnum\the\language=\z@ + \expandafter\ifx\csname #1hyphenmins\endcsname\relax + \set@hyphenmins\tw@\thr@@\relax + \else + \expandafter\expandafter\expandafter\set@hyphenmins + \csname #1hyphenmins\endcsname + \fi \the\toks@ \toks@{}% \fi} diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index cbcaea124fd..2796adeedb7 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -38,7 +38,7 @@ %% 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}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -48,7 +48,7 @@ %% by Javier Bezos %% all rights reserved. \ProvidesLanguage{nil} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % Nil language] \LdfInit{nil}{datenil} \ifx\l@nohyphenation\@undefined diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index d8fb0240f4f..b56bd93ef6e 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -38,7 +38,7 @@ %% 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}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -47,8 +47,8 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\def\bbl@version{3.9e} -\def\bbl@date{2013/04/15} +\def\bbl@version{3.9f} +\def\bbl@date{2013/05/16} \ifx\ProvidesFile\@undefined \def\ProvidesFile#1[#2 #3 #4]{% \wlog{File: #1 #4 #3 <#2>}% @@ -70,7 +70,7 @@ \endgroup} \fi \ProvidesFile{switch.def} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % Babel language switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax -- cgit v1.2.3