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/source/latex/babel/babel.dtx | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx index ccb3254716c..15a5b97bfb4 100644 --- a/Master/texmf-dist/source/latex/babel/babel.dtx +++ b/Master/texmf-dist/source/latex/babel/babel.dtx @@ -44,7 +44,7 @@ % %% File 'babel.dtx' %\fi -%%\ProvidesFile{babel.dtx}[2013/04/15 v3.9e The Babel package] +%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] %\iffalse % % Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX; @@ -85,8 +85,6 @@ \newcommand*\cls[1]{\texttt{#1}} \newcommand*\pkg[1]{\texttt{#1}} \addtolength{\oddsidemargin}{1em} -\lefthyphenmin=2 -\righthyphenmin=3 % Stolen and adapted from microtype: \usepackage{color} \definecolor{thered} {rgb}{0.65,0.04,0.07} @@ -1231,7 +1229,7 @@ dialect and an attribute. \begin{verbatim} \ProvidesLanguage{} - [2013/04/22 v0.0 support from the babel system] + [2013/05/16 v0.0 support from the babel system] \LdfInit{}{captions} \ifx\undefined\l@ @@ -1934,8 +1932,8 @@ help from Bernd Raichle, for which I am grateful. % necessary} % \begin{macrocode} %<*kernel> -\def\bbl@version{3.9e} -\def\bbl@date{2013/04/15} +\def\bbl@version{3.9f} +\def\bbl@date{2013/05/16} % %<*patterns> \xdef\bbl@format{\jobname} @@ -1990,7 +1988,7 @@ help from Bernd Raichle, for which I am grateful. %\ProvidesLanguage{nil} %\ProvidesFile{babel.drv} %\ProvidesFile{user.drv} - [2013/04/15 v3.9e % + [2013/05/16 v3.9f % % The Babel package] % Babel common definitions] % Babel language switching mechanism] @@ -2042,10 +2040,10 @@ help from Bernd Raichle, for which I am grateful. %<*package> \@ifpackagewith{babel}{debug} {\let\bbl@tempa\relax} - {\def\bbl@tempa{3.9e}}% + {\def\bbl@tempa{3.9f}}% % %<*core> -\def\bbl@tempa{3.9e} +\def\bbl@tempa{3.9f} % %<*core|package> \ifx\bbl@version\bbl@tempa\else @@ -6874,7 +6872,7 @@ help from Bernd Raichle, for which I am grateful. % % \begin{macrocode} %<*patterns> -\toks8{Babel <3.9e> and hyphenation patterns for }% +\toks8{Babel <3.9f> and hyphenation patterns for }% % \end{macrocode} % % \changes{babel~3.5g}{1996/07/09}{Removed the use of @@ -7013,6 +7011,8 @@ help from Bernd Raichle, for which I am grateful. % \cs{@empty} as the latter is unknown in plain} % % \changes{babel~3.9a}{2012/06/25}{Added \cs{bbl@languages}} +% \changes{babel~3.9f}{2013/05/16}{Restored code to set default +% hyphenmins, which was deleted mistakenly} % \cs{bbl@languages} saves a snapshot of the loaded languagues in the % form \cs{bbl@elt}\marg{language-name}\marg{number}% % \marg{patterns-file}\marg{exceptions-file}. Note the last 2 @@ -7047,6 +7047,12 @@ help from Bernd Raichle, for which I am grateful. \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} -- cgit v1.2.3